From nobody Fri Dec 19 16:00:43 2025 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A106B398F82 for ; Fri, 5 Dec 2025 13:46:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.156.1 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764942369; cv=none; b=Kds3h636BcBrNy4gomIxFpulSxwy5B2seljMLq9W8MeMb7kzFRvRXM+IKze6LlWuunl/0xlifw+mDgJSZFJ/GvNTx6kMx9EG7DSY6Vh0vjKhIje8buVOGMP07oYe343ZGzyvEfBprdUBuvIFCvDxWPeGVyp3GWPcx521DVJjflo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764942369; c=relaxed/simple; bh=CRcUeOIm/T+bkuEPbl2Z83TW3TJ63/YyvWaUS5Ctwk4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=guQE3eleYW521TAtLjtJ9wFctCd2lxvLRmLoiNBeGVOKVv971zZFZjJjOhojz5OMj81rIyPBnvF9cPgQWrX/F62YJBD6iL9l4H/5naasMe8NDtMi0aNPwb7/u0FBpD9C8LNYtp2h2g6lbLxi8pgVW9g9PMAyL3bh8IZ5hmiQU1w= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com; spf=pass smtp.mailfrom=linux.ibm.com; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b=hE8Y7dIm; arc=none smtp.client-ip=148.163.156.1 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="hE8Y7dIm" Received: from pps.filterd (m0353729.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 5B5APLQ7002616; Fri, 5 Dec 2025 13:45:48 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=JYvvikyQkKtNKrZSv UfCiihX0MQfUvZ4A2G4qdiWaYs=; b=hE8Y7dImF8M3KiSDujHVb/P009ND4jCM0 DHTXX80ZSj2peYF7ReAbAUTErX6/3ZNPC8DQQL4DsJhrHXnpb5+akWCVTd0kYdpC 6ypAvMHRSS7RlxarihSm1R6/JDBIPdNZGE3F11uGsEZtozTpWQPG2vozHDImOz+0 Sqm+uZg0obT6ULoiurWuh5rVn/GTrRAcsHQpRkUSUy8+c7tKyopv5z5z6gGzxdFf oTp8297LpdGrDdPZRzs1PfMUcOgIHWwM/riR8y8/MlUawtS8/TBRTm0wL6oRuoLV su7xBQShEmx4w5EsWgVXV/1C3B8jnj2JCxBF+PWxUP0zJrvXB92lA== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4aqrh7dyqt-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 05 Dec 2025 13:45:48 +0000 (GMT) Received: from m0353729.ppops.net (m0353729.ppops.net [127.0.0.1]) by pps.reinject (8.18.1.12/8.18.0.8) with ESMTP id 5B5DXbwc017700; Fri, 5 Dec 2025 13:45:48 GMT Received: from ppma13.dal12v.mail.ibm.com (dd.9e.1632.ip4.static.sl-reverse.com [50.22.158.221]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4aqrh7dyqq-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 05 Dec 2025 13:45:48 +0000 (GMT) Received: from pps.filterd (ppma13.dal12v.mail.ibm.com [127.0.0.1]) by ppma13.dal12v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 5B5BnA2G003834; Fri, 5 Dec 2025 13:45:47 GMT Received: from smtprelay05.fra02v.mail.ibm.com ([9.218.2.225]) by ppma13.dal12v.mail.ibm.com (PPS) with ESMTPS id 4ardck59ab-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 05 Dec 2025 13:45:46 +0000 Received: from smtpav06.fra02v.mail.ibm.com (smtpav06.fra02v.mail.ibm.com [10.20.54.105]) by smtprelay05.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 5B5Djhjm45089084 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 5 Dec 2025 13:45:43 GMT Received: from smtpav06.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 575982004D; Fri, 5 Dec 2025 13:45:43 +0000 (GMT) Received: from smtpav06.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id E607F20049; Fri, 5 Dec 2025 13:45:40 +0000 (GMT) Received: from ltcd48-lp3.ltc.tadn.ibm.com (unknown [9.5.7.39]) by smtpav06.fra02v.mail.ibm.com (Postfix) with ESMTP; Fri, 5 Dec 2025 13:45:40 +0000 (GMT) From: Narayana Murty N To: mahesh@linux.ibm.com, maddy@linux.ibm.com, mpe@ellerman.id.au, christophe.leroy@csgroup.eu, gregkh@linuxfoundation.org, oohall@gmail.com, npiggin@gmail.com Cc: linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, tyreld@linux.ibm.com, vaibhav@linux.ibm.com, sbhat@linux.ibm.com, ganeshgr@linux.ibm.com, sourabhjain@linux.ibm.com Subject: [PATCH 1/4] powerpc/rtas: Handle special return format for RTAS_FN_IBM_OPEN_ERRINJCT Date: Fri, 5 Dec 2025 03:45:07 -0600 Message-ID: <20251205094510.4671-2-nnmlinux@linux.ibm.com> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251205094510.4671-1-nnmlinux@linux.ibm.com> References: <20251205094510.4671-1-nnmlinux@linux.ibm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Authority-Analysis: v=2.4 cv=dK+rWeZb c=1 sm=1 tr=0 ts=6932e20c cx=c_pps a=AfN7/Ok6k8XGzOShvHwTGQ==:117 a=AfN7/Ok6k8XGzOShvHwTGQ==:17 a=wP3pNCr1ah4A:10 a=VkNPw1HP01LnGYTKEx00:22 a=1mVJ_uiqAAAA:8 a=VnNF1IyMAAAA:8 a=mIsVmt5rGckx9ddGVSsA:9 a=h67g7WpEjx8dfGT80pje:22 X-Proofpoint-GUID: zFWtLkZZ1spCPSctBynvjOUfaMab-X1R X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMTI5MDAyMCBTYWx0ZWRfX5LX8gidQHPN7 yYEDNYO7s6AMI+udpPZ5tuJ92nq9w+A3HkH9/VsLORltEnXz7Yf7iXZlVfPR6r8IVH+IvL20udI 7myGIGDfiD8rM13VjA+nwHaYD0bA8pveVSTTSxleObGZ6GZeDmBuosI38XOkKIHnhpf3pWI1Fr/ NCUtFMfQb6hYGXVwmCUAGYxzMMjBg5wk0RuO0LbvQshRHrTLl1pWwHhmOsr3U17B4lMHqNeDUbO 6dHq373JIe+nZ7GSeTEakLvhQXBEQWFwg5sFjKai8UbbwDVtskoCfkceZGIkfGuoz8n7qP9NrlT F9ZqcBsHVN03ghZw1cZDey7qzyVJ/JPs6+Kl7eyDYx5bLhMatqDH+z16CH2molDP8L6HsiPxcDs 4G1dD3JB7LEA4Tclud+kAU840YUn3A== X-Proofpoint-ORIG-GUID: XklVvrKlvvDrazOtJH8DP9ZE3W_fpRVk X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.9,FMLib:17.12.100.49 definitions=2025-12-05_04,2025-12-04_04,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 lowpriorityscore=0 clxscore=1015 priorityscore=1501 bulkscore=0 adultscore=0 phishscore=0 impostorscore=0 spamscore=0 malwarescore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2510240000 definitions=main-2511290020 Content-Type: text/plain; charset="utf-8" RTAS_FN_IBM_OPEN_ERRINJCT returns results in special format: rets[0] =3D session token (output) rets[1] =3D status code rets[2..] =3D additional outputs (if any) Unlike standard RTAS calls where: rets[0] =3D status code rets[1..] =3D outputs This patch adds special handling for OPEN_ERRINJCT to: 1. Check correct status position (rets[1]) for __fetch_rtas_last_error() 2. Copy all rets[0..nret-1] to outputs[] (including token at rets[0]) 3. Return status from rets[1] instead of rets[0] Reference: OpenPOWER PAPR documentation https://files.openpower.foundation/s/XFgfMaqLMD5Bcm8 Signed-off-by: Narayana Murty N --- arch/powerpc/kernel/rtas.c | 30 ++++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/arch/powerpc/kernel/rtas.c b/arch/powerpc/kernel/rtas.c index 8d81c1e7a8db..04c8438aadda 100644 --- a/arch/powerpc/kernel/rtas.c +++ b/arch/powerpc/kernel/rtas.c @@ -1183,7 +1183,7 @@ int rtas_call(int token, int nargs, int nret, int *ou= tputs, ...) unsigned long flags; struct rtas_args *args; char *buff_copy =3D NULL; - int ret; + int ret =3D 0; =20 if (!rtas.entry || token =3D=3D RTAS_UNKNOWN_SERVICE) return -1; @@ -1213,15 +1213,33 @@ int rtas_call(int token, int nargs, int nret, int *= outputs, ...) va_rtas_call_unlocked(args, token, nargs, nret, list); va_end(list); =20 + /* Special handling for RTAS_FN_IBM_OPEN_ERRINJCT for error fetching */ /* A -1 return code indicates that the last command couldn't be completed due to a hardware error. */ - if (be32_to_cpu(args->rets[0]) =3D=3D -1) + + if (token =3D=3D rtas_function_token(RTAS_FN_IBM_OPEN_ERRINJCT) && nret >= 1) + ret =3D be32_to_cpu(args->rets[1]); + else if (nret > 0) + ret =3D be32_to_cpu(args->rets[0]); + + if (ret =3D=3D -1) buff_copy =3D __fetch_rtas_last_error(NULL); =20 - if (nret > 1 && outputs !=3D NULL) - for (i =3D 0; i < nret-1; ++i) - outputs[i] =3D be32_to_cpu(args->rets[i + 1]); - ret =3D (nret > 0) ? be32_to_cpu(args->rets[0]) : 0; + /* Handle outputs and return status */ + if (nret > 1 && outputs !=3D NULL) { + if (token =3D=3D rtas_function_token(RTAS_FN_IBM_OPEN_ERRINJCT)) { + /* Special case: rets[0]=3Dtoken, rets[1]=3Dstatus, rets[2..]=3Doutputs= */ + for (i =3D 0; i < nret; ++i) + outputs[i] =3D be32_to_cpu(args->rets[i]); + } else { + /* Normal case: rets[0]=3Dstatus, rets[1..]=3Doutputs */ + for (i =3D 0; i < nret - 1; ++i) + outputs[i] =3D be32_to_cpu(args->rets[i + 1]); + } + } else { + /* No outputs: just ret is status */ + ret =3D (nret > 0) ? be32_to_cpu(args->rets[0]) : 0; + } =20 lockdep_unpin_lock(&rtas_lock, cookie); raw_spin_unlock_irqrestore(&rtas_lock, flags); --=20 2.51.1 From nobody Fri Dec 19 16:00:43 2025 Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 94CF1313E21 for ; Fri, 5 Dec 2025 13:46:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.158.5 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764942372; cv=none; b=G1luKOlVz2Mo7satWUBwWy4DvvxeA8taVUIaWfKxN+5UVq9Yt/VjqLSTTNi/vDsLqaZE2SxshzidDHog0RMwXJ/hStKW6f03loijnNkCrL/IdfrAbr83no+9ZZ0UsHGf8MCYj3ids84301WhSfT6mCvV4BIiaP6DeIRb9ySSewM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764942372; c=relaxed/simple; bh=Aa+crx1O0iBIAXaSGTqn/cJaquG2x6lXhqlXzR3fTDs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=F9FS+p9HlzHdFuPfUaHjYwFqB/Fskpt3XP3Z86BhmgbDijKkhOnvX/iCGyW2kYp6LfGwfCrIbi6NpAtDBAcRQnAEqW+ZwCy9cANd/22EqtvKsDMjzi+u3HwX7U14TckGekTOx9NJ+QbYEBDVCS7cgoLPpyyK42tfe5z5UdSCP3A= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com; spf=pass smtp.mailfrom=linux.ibm.com; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b=nBx5kb/V; arc=none smtp.client-ip=148.163.158.5 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="nBx5kb/V" Received: from pps.filterd (m0353725.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 5B5B8xrq005709; Fri, 5 Dec 2025 13:45:52 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=zW9vSwfFQ2D5LF3bm qLnb0HWMxV6HDP4qdbmjmndgMc=; b=nBx5kb/V8nDmGGe4A4hdFF9CzyEq7JG+5 tmoipzM/zGpcV5tYYJXNxJXlYtxABow3sjR36qYKhSzCqR7tTF/jR/uCBIpedV3H J9ewlcD+H94VhgnGwnAf/a5DYp0v9pjjKy8NzfPRLYhLSgAftomoFPQXMpjChq0k sb2qUbE4J1lKW6cPIZj8yKa/He+48bRrEkG5OOnv68//ER9z2Wcuuhi3WFfYK0On t56ZnLcQeikL34gCWRkoLp3xNrTxK+hb4IZ2R2vnXVtPiKpDk141aBkc08+EBYVN ejGKdj83vCtIw5ZgvhjTKVKMuWJZVa7GZ0jZVHy5sEislciiR5KSQ== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4aqq8v57we-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 05 Dec 2025 13:45:52 +0000 (GMT) Received: from m0353725.ppops.net (m0353725.ppops.net [127.0.0.1]) by pps.reinject (8.18.1.12/8.18.0.8) with ESMTP id 5B5DjpOZ028459; Fri, 5 Dec 2025 13:45:51 GMT Received: from ppma12.dal12v.mail.ibm.com (dc.9e.1632.ip4.static.sl-reverse.com [50.22.158.220]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4aqq8v57wb-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 05 Dec 2025 13:45:51 +0000 (GMT) Received: from pps.filterd (ppma12.dal12v.mail.ibm.com [127.0.0.1]) by ppma12.dal12v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 5B5DaWmE024120; Fri, 5 Dec 2025 13:45:50 GMT Received: from smtprelay01.fra02v.mail.ibm.com ([9.218.2.227]) by ppma12.dal12v.mail.ibm.com (PPS) with ESMTPS id 4arb5swmxx-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 05 Dec 2025 13:45:50 +0000 Received: from smtpav06.fra02v.mail.ibm.com (smtpav06.fra02v.mail.ibm.com [10.20.54.105]) by smtprelay01.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 5B5DjkMp60293398 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 5 Dec 2025 13:45:46 GMT Received: from smtpav06.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 112DF20049; Fri, 5 Dec 2025 13:45:46 +0000 (GMT) Received: from smtpav06.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id A01862004D; Fri, 5 Dec 2025 13:45:43 +0000 (GMT) Received: from ltcd48-lp3.ltc.tadn.ibm.com (unknown [9.5.7.39]) by smtpav06.fra02v.mail.ibm.com (Postfix) with ESMTP; Fri, 5 Dec 2025 13:45:43 +0000 (GMT) From: Narayana Murty N To: mahesh@linux.ibm.com, maddy@linux.ibm.com, mpe@ellerman.id.au, christophe.leroy@csgroup.eu, gregkh@linuxfoundation.org, oohall@gmail.com, npiggin@gmail.com Cc: linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, tyreld@linux.ibm.com, vaibhav@linux.ibm.com, sbhat@linux.ibm.com, ganeshgr@linux.ibm.com, sourabhjain@linux.ibm.com Subject: [PATCH 2/4] powerpc/pseries: Add RTAS error injection buffer infrastructure Date: Fri, 5 Dec 2025 03:45:08 -0600 Message-ID: <20251205094510.4671-3-nnmlinux@linux.ibm.com> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251205094510.4671-1-nnmlinux@linux.ibm.com> References: <20251205094510.4671-1-nnmlinux@linux.ibm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: CQ-PqF0qz3S83R9RwFT7O3wn5tTosToV X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMTI5MDAwOCBTYWx0ZWRfXz+GOrvrsJlDF YhITCdRbyIyPItDeDoJBKaUgGSBei3zNW2GZB/f3pWC6CJZemrLn+kjJKnTVkA+1SU7JaRrFpuK s3b0B8+IDzEAg8T59KivO1mpmJ7bh/3u49SUg9WGAW+YYaeHytQmOZ1Ictmgsy2Tn98Tmcqcte1 86fyYLS1aMa4L8WTisiGe81wMIQ4ymaR+6O/wCTCnVjfpVTJWiaGRmVK7ap0V+ljwL2xYfazZDn eFs4qLVQb3hukDtVBVNeIcpo7cqbFjewH1abVt1jKBQUUdSiPs2tsw5dJS1qHHiEufvVyoDqSNk xJJ1jHvoRJQlQspQvBxr3MgeEfVAX4KY5vo4hfbm9cDUdozJg1BxKlMpBII/D1p4i4Kekc8w8PD 7pMuyStGUoCrzEb1AqZhitE2oYhrww== X-Authority-Analysis: v=2.4 cv=Scz6t/Ru c=1 sm=1 tr=0 ts=6932e210 cx=c_pps a=bLidbwmWQ0KltjZqbj+ezA==:117 a=bLidbwmWQ0KltjZqbj+ezA==:17 a=wP3pNCr1ah4A:10 a=VkNPw1HP01LnGYTKEx00:22 a=VnNF1IyMAAAA:8 a=wGYcmt_NxZN9edKSF48A:9 X-Proofpoint-GUID: -Pml54njcR_e1BWp5AlaayyP0uGCVYKv X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.9,FMLib:17.12.100.49 definitions=2025-12-05_04,2025-12-04_04,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 phishscore=0 bulkscore=0 lowpriorityscore=0 adultscore=0 clxscore=1015 spamscore=0 impostorscore=0 priorityscore=1501 malwarescore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2510240000 definitions=main-2511290008 Content-Type: text/plain; charset="utf-8" Adds global infrastructure required by the injection engine: - a 1KB aligned RTAS working buffer in rtas.c - a spinlock to serialize buffer access - UAPI definitions for error-injection tokens (added to eeh.h) Signed-off-by: Narayana Murty N --- arch/powerpc/include/asm/rtas.h | 21 +++++++++++++++++++++ arch/powerpc/include/uapi/asm/eeh.h | 18 ++++++++++++++++++ arch/powerpc/kernel/rtas.c | 12 ++++++++++++ 3 files changed, 51 insertions(+) diff --git a/arch/powerpc/include/asm/rtas.h b/arch/powerpc/include/asm/rta= s.h index d046bbd5017d..82512f822c7a 100644 --- a/arch/powerpc/include/asm/rtas.h +++ b/arch/powerpc/include/asm/rtas.h @@ -519,6 +519,27 @@ int rtas_get_error_log_max(void); extern spinlock_t rtas_data_buf_lock; extern char rtas_data_buf[RTAS_DATA_BUF_SIZE]; =20 +/* + * RTAS Error Injection Buffer (PAPR-compliant) + * =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D + * + * 1KB aligned, zero-initialized buffer for ibm,errinjct RTAS work area. + * Protected by rtas_errinjct_buf_lock for concurrent access safety. + * + * PAPR Requirement: ibm,errinjct requires a caller-allocated buffer passed + * via physical address. Buffer must accommodate largest error type layout= s: + * - IOA bus error (64-bit): 8x32-bit words (32 bytes) + * - All other types: <=3D4x32-bit words (16 bytes) + * + * Usage: + * prepare_errinjct_buffer() -> spin_lock() -> rtas_call() -> spin_unlock() + * + * Alignment: SZ_1K ensures PAPR firmware requirements and cache-line safe= ty. + */ +#define RTAS_ERRINJCT_BUF_SIZE 1024 +extern spinlock_t rtas_errinjct_buf_lock; +extern char rtas_errinjct_buf[RTAS_ERRINJCT_BUF_SIZE]; + /* RMO buffer reserved for user-space RTAS use */ extern unsigned long rtas_rmo_buf; =20 diff --git a/arch/powerpc/include/uapi/asm/eeh.h b/arch/powerpc/include/uap= i/asm/eeh.h index 3b5c47ff3fc4..86645cab2827 100644 --- a/arch/powerpc/include/uapi/asm/eeh.h +++ b/arch/powerpc/include/uapi/asm/eeh.h @@ -41,4 +41,22 @@ #define EEH_ERR_FUNC_DMA_WR_TARGET 19 #define EEH_ERR_FUNC_MAX 19 =20 +/* RTAS PCI Error Injection Token Types */ +#define RTAS_ERR_TYPE_FATAL 0x1 +#define RTAS_ERR_TYPE_RECOVERED_RANDOM_EVENT 0x2 +#define RTAS_ERR_TYPE_RECOVERED_SPECIAL_EVENT 0x3 +#define RTAS_ERR_TYPE_CORRUPTED_PAGE 0x4 +#define RTAS_ERR_TYPE_CORRUPTED_SLB 0x5 +#define RTAS_ERR_TYPE_TRANSLATOR_FAILURE 0x6 +#define RTAS_ERR_TYPE_IOA_BUS_ERROR 0x7 +#define RTAS_ERR_TYPE_PLATFORM_SPECIFIC 0x8 +#define RTAS_ERR_TYPE_CORRUPTED_DCACHE_START 0x9 +#define RTAS_ERR_TYPE_CORRUPTED_DCACHE_END 0xA +#define RTAS_ERR_TYPE_CORRUPTED_ICACHE_START 0xB +#define RTAS_ERR_TYPE_CORRUPTED_ICACHE_END 0xC +#define RTAS_ERR_TYPE_CORRUPTED_TLB_START 0xD +#define RTAS_ERR_TYPE_CORRUPTED_TLB_END 0xE +#define RTAS_ERR_TYPE_IOA_BUS_ERROR_64 0xF +#define RTAS_ERR_TYPE_UPSTREAM_IO_ERROR 0x10 + #endif /* _ASM_POWERPC_EEH_H */ diff --git a/arch/powerpc/kernel/rtas.c b/arch/powerpc/kernel/rtas.c index 04c8438aadda..ae1cd7964bae 100644 --- a/arch/powerpc/kernel/rtas.c +++ b/arch/powerpc/kernel/rtas.c @@ -769,6 +769,18 @@ EXPORT_SYMBOL_GPL(rtas_data_buf); =20 unsigned long rtas_rmo_buf; =20 +/* + * RTAS Error Injection Buffer - Global Definitions + * Global 1KB buffer and spinlock for ibm,errinjct RTAS service. + * Exported for pseries EEH error injection usage. + */ + +DEFINE_SPINLOCK(rtas_errinjct_buf_lock); +EXPORT_SYMBOL_GPL(rtas_errinjct_buf_lock); + +char rtas_errinjct_buf[1024] __aligned(SZ_1K); +EXPORT_SYMBOL_GPL(rtas_errinjct_buf); + /* * If non-NULL, this gets called when the kernel terminates. * This is done like this so rtas_flash can be a module. --=20 2.51.1 From nobody Fri Dec 19 16:00:43 2025 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EC6F81D9663 for ; Fri, 5 Dec 2025 13:46:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.156.1 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764942381; cv=none; b=W/TKQLW3jvWMxIMsfM7FpBSBUlrgFL3Rdqc/6G0A14sIloG4Muhe1tHRfMoyP6YMVlF3qkrUEVVV/aevoxndQ36EuvICq4rjg8C7lunSNrfqyd//QoNxzTuoLeoWInlm/uNZHBE1hwPTEzgic/YvXG1K0Ru+LEBatjlIkQEy4RU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764942381; c=relaxed/simple; bh=wrcKk7B/v7DiIjij8TiTvRbTxTe6Mt4NFD5xutggsbM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=H6wTNJRse/SwV8c0OqYrBu+Sx3oaL4gVRk/wLtVCl2zXyTJKChH/0oDEfK1FjRK26le6+0TS2SVzQUPw9ZXLwmk4XAsvP1G3/TpN8rcrwNRhFJ+HNgfGBnU3a/pHgXr93LYmbq5zB8cuGQ9GV1Y3fIg8uglR00pXdbx2Fb37cg4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com; spf=pass smtp.mailfrom=linux.ibm.com; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b=RLId+3z5; arc=none smtp.client-ip=148.163.156.1 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="RLId+3z5" Received: from pps.filterd (m0353729.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 5B4N5edf029380; Fri, 5 Dec 2025 13:45:54 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=s43gknO5+HJewZG89 vel4Fp6nmwF6b34l6NMf10M8uE=; b=RLId+3z5EcuToDVmBD/D75DXW+d7EaQxm D+FDwMrPzMvv39WRW7DroSCngG+8IxftTE09yEerQwGzrf0pRZOzGq67v1NosPLX s51uBmjr0f+DR5cWRTtHhA/zW/QRXid6JY3Ob1XrSoePOvN7eHrv024JfTfWhCS7 BilgwwKdOZdh1EuOlpjGJNGXMRSe7X/QIJlcKqPRiENWyhTBNWOmacmMYdqXHbLB ckvI+GQaNFcoITddiwBacnvwiLh1D44+yMQ1uvuGYWMDpt/ohONZS5rCpbpmpTxf XADlkRqfmXm1rQi+P43hw5bRB9YJ4PcedSh1WOcgDwxvC5z9s4wgg== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4aqrh7dyr4-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 05 Dec 2025 13:45:54 +0000 (GMT) Received: from m0353729.ppops.net (m0353729.ppops.net [127.0.0.1]) by pps.reinject (8.18.1.12/8.18.0.8) with ESMTP id 5B5DjrQU010995; Fri, 5 Dec 2025 13:45:53 GMT Received: from ppma13.dal12v.mail.ibm.com (dd.9e.1632.ip4.static.sl-reverse.com [50.22.158.221]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4aqrh7dyr0-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 05 Dec 2025 13:45:53 +0000 (GMT) Received: from pps.filterd (ppma13.dal12v.mail.ibm.com [127.0.0.1]) by ppma13.dal12v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 5B5C29G8003853; Fri, 5 Dec 2025 13:45:52 GMT Received: from smtprelay04.fra02v.mail.ibm.com ([9.218.2.228]) by ppma13.dal12v.mail.ibm.com (PPS) with ESMTPS id 4ardck59ap-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 05 Dec 2025 13:45:52 +0000 Received: from smtpav06.fra02v.mail.ibm.com (smtpav06.fra02v.mail.ibm.com [10.20.54.105]) by smtprelay04.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 5B5Djmkc10617196 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 5 Dec 2025 13:45:48 GMT Received: from smtpav06.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id BEFC92004E; Fri, 5 Dec 2025 13:45:48 +0000 (GMT) Received: from smtpav06.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 5A46B20049; Fri, 5 Dec 2025 13:45:46 +0000 (GMT) Received: from ltcd48-lp3.ltc.tadn.ibm.com (unknown [9.5.7.39]) by smtpav06.fra02v.mail.ibm.com (Postfix) with ESMTP; Fri, 5 Dec 2025 13:45:46 +0000 (GMT) From: Narayana Murty N To: mahesh@linux.ibm.com, maddy@linux.ibm.com, mpe@ellerman.id.au, christophe.leroy@csgroup.eu, gregkh@linuxfoundation.org, oohall@gmail.com, npiggin@gmail.com Cc: linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, tyreld@linux.ibm.com, vaibhav@linux.ibm.com, sbhat@linux.ibm.com, ganeshgr@linux.ibm.com, sourabhjain@linux.ibm.com Subject: [PATCH 3/4] powerpc/pseries: Add RTAS error injection validation helpers Date: Fri, 5 Dec 2025 03:45:09 -0600 Message-ID: <20251205094510.4671-4-nnmlinux@linux.ibm.com> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251205094510.4671-1-nnmlinux@linux.ibm.com> References: <20251205094510.4671-1-nnmlinux@linux.ibm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Authority-Analysis: v=2.4 cv=dK+rWeZb c=1 sm=1 tr=0 ts=6932e212 cx=c_pps a=AfN7/Ok6k8XGzOShvHwTGQ==:117 a=AfN7/Ok6k8XGzOShvHwTGQ==:17 a=wP3pNCr1ah4A:10 a=VkNPw1HP01LnGYTKEx00:22 a=VnNF1IyMAAAA:8 a=roLE4PQrIjLf_F_GOEgA:9 X-Proofpoint-GUID: IUZp5isjWve7TgoWp2-taf51ax91bns2 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMTI5MDAyMCBTYWx0ZWRfX867lieRzBi7P rx19XrpnXO9LFO+2fl24ct7SX/1zwlwZLx+Jxlx2dj5ZPFseI2r2hJxJwK4xAQLvO7S/juLJrlf G5EnmJPqwk6T8cwWcze/Tdn7xoVgGDtL2rNQ2u7TJFoWIm74fZCyLgnCiIk56nbqiAlxAEz47tW kHfis86S+l/VG72C7eNuDtjIu5N8skjhqN7glIXgQAMQnVJ4cPX7EhOowTdFzsj90CpcFV3LBFK o4sUuMeDxq0pknfut1BX6nPFgKczeJ0DfSaunTfOpVV1Zw8atAj4ROmmQqs9xByRvDLqdQs9stw dptCGZBC6UwF9fvQuQL3D318zCHNOfDM9g0W5lJCFh6757aIdzuS+2MKPBsDmrvBWF1rPOCdRaB ZjWRMgZJkSXIiFthoBTLmJy46+hdmA== X-Proofpoint-ORIG-GUID: F2VSgw1vE1UoBF1G4-bgjR89gAPi__jz X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.9,FMLib:17.12.100.49 definitions=2025-12-05_04,2025-12-04_04,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 lowpriorityscore=0 clxscore=1015 priorityscore=1501 bulkscore=0 adultscore=0 phishscore=0 impostorscore=0 spamscore=0 malwarescore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2510240000 definitions=main-2511290020 Content-Type: text/plain; charset="utf-8" Add comprehensive validation helpers for RTAS error injection parameters: - validate_addr_mask_in_pe(): BAR range validation - validate_err_type(): Token range check - Type-specific validators (special-event, corrupted-page, ioa-bus-error) Signed-off-by: Narayana Murty N --- arch/powerpc/platforms/pseries/eeh_pseries.c | 261 +++++++++++++++++++ 1 file changed, 261 insertions(+) diff --git a/arch/powerpc/platforms/pseries/eeh_pseries.c b/arch/powerpc/pl= atforms/pseries/eeh_pseries.c index b12ef382fec7..110e8cf10985 100644 --- a/arch/powerpc/platforms/pseries/eeh_pseries.c +++ b/arch/powerpc/platforms/pseries/eeh_pseries.c @@ -33,6 +33,10 @@ #include #include =20 +#ifndef pr_fmt +#define pr_fmt(fmt) "EEH: " fmt +#endif + /* RTAS tokens */ static int ibm_set_eeh_option; static int ibm_set_slot_reset; @@ -786,6 +790,263 @@ static int pseries_notify_resume(struct eeh_dev *edev) } #endif =20 +/** + * validate_addr_mask_in_pe - Validate that an addr+mask fall within PE's = BARs + * @pe: EEH PE containing one or more PCI devices + * @addr: Address to validate + * @mask: Address mask to validate + * + * Checks that @addr is mapped into a BAR/MMIO region of any device belong= ing + * to the PE. If @mask is non-zero, ensures it is consistent with @addr. + * + * Return: 0 if valid, RTAS_INVALID_PARAMETER on failure. + */ + +static int validate_addr_mask_in_pe(struct eeh_pe *pe, unsigned long addr, + unsigned long mask) +{ + struct eeh_dev *edev, *tmp; + struct pci_dev *pdev; + int bar; + resource_size_t bar_start, bar_len; + bool valid =3D false; + + /* nothing to validate */ + if (addr =3D=3D 0 && mask =3D=3D 0) + return 0; + + eeh_pe_for_each_dev(pe, edev, tmp) { + pdev =3D eeh_dev_to_pci_dev(edev); + if (!pdev) + continue; + + for (bar =3D 0; bar < PCI_NUM_RESOURCES; bar++) { + bar_start =3D pci_resource_start(pdev, bar); + bar_len =3D pci_resource_len(pdev, bar); + + if (!bar_len) + continue; + + if (addr >=3D bar_start && addr < (bar_start + bar_len)) { + /* ensure mask makes sense for the addr value */ + if ((addr & mask) !=3D addr) { + pr_err("Mask 0x%lx invalid for addr 0x%lx in BAR[%d] range 0x%llx-0x%= llx\n", + mask, addr, bar, + (unsigned long long)bar_start, + (unsigned long long)(bar_start + bar_len)); + return RTAS_INVALID_PARAMETER; + } + + pr_debug("addr=3D0x%lx with mask=3D0x%lx validated in BAR[%d] of %s\n", + addr, mask, bar, pci_name(pdev)); + valid =3D true; + } + } + } + + if (!valid) { + pr_err("addr=3D0x%lx not valid within any BAR of any device in PE\n", + addr); + return RTAS_INVALID_PARAMETER; + } + + return 0; +} + +/** + * validate_err_type - Basic sanity check for RTAS error type + * @type: RTAS error type + * + * Ensures that the error type is within the valid RTAS error type range. + * + * Return: true if valid, false otherwise. + */ + +static bool validate_err_type(int type) +{ + if (type < RTAS_ERR_TYPE_FATAL || + type > RTAS_ERR_TYPE_UPSTREAM_IO_ERROR) + return false; + + return true; +} + +/** + * validate_special_event - Validate parameters for special-event injection + * @addr: Address parameter (should be zero) + * @mask: Mask parameter (should be zero) + * + * Special-event error injection should not take addr/mask. Rejects if ei= ther + * is set. + * + * Return: 0 if valid, RTAS_INVALID_PARAMETER otherwise. + */ + +static int validate_special_event(unsigned long addr, unsigned long mask) +{ + if (addr || mask) { + pr_err("Special-event should not specify addr/mask\n"); + return RTAS_INVALID_PARAMETER; + } + return 0; +} + +/** + * validate_corrupted_page - Validate parameters for corrupted-page inject= ion + * @pe: EEH PE (unused here, for consistency) + * @addr: Physical page address (required) + * @mask: Address mask (ignored if non-zero) + * + * Ensures a valid non-zero page address is provided. Warns if mask is set. + * + * Return: 0 if valid, RTAS_INVALID_PARAMETER otherwise. + */ + +static int validate_corrupted_page(struct eeh_pe *pe __maybe_unused, + unsigned long addr, unsigned long mask) +{ + if (!addr) { + pr_err("corrupted-page requires non-zero addr\n"); + return RTAS_INVALID_PARAMETER; + } + /* Mask not meaningful for corrupted-page */ + if (mask) + pr_warn("corrupted-page ignoring mask=3D0x%lx\n", mask); + + return 0; +} + +/** + * validate_ioa_bus_error - Validate parameters for IOA bus error injection + * @pe: EEH PE whose BARs are validated against + * @addr: Address parameter (optional) + * @mask: Mask parameter (optional) + * + * For IOA bus error injections, @addr and @mask are optional. If present, + * they must map into the PE's MMIO/CFG space. + * + * Return: 0 if valid or addr/mask absent, RTAS_INVALID_PARAMETER otherwis= e. + */ + +static int validate_ioa_bus_error(struct eeh_pe *pe, + unsigned long addr, unsigned long mask) +{ + /* Must map into BAR/MMIO/CFG space of PE */ + return validate_addr_mask_in_pe(pe, addr, mask); +} + + +/** + * prepare_errinjct_buffer - Prepare RTAS error injection work buffer + * @pe: EEH PE for the target device(s) + * @type: RTAS error type + * @func: Error function selector (semantics vary by type) + * @addr: Address argument (type-dependent) + * @mask: Mask argument (type-dependent) + * + * Clears the global error injection work buffer and populates it based on + * the error type and parameters provided. Performs inline validation of t= he + * arguments for each supported error type. + * + * Return: 0 on success, or RTAS_INVALID_PARAMETER / -EINVAL on failure. + */ + +static int prepare_errinjct_buffer(struct eeh_pe *pe, int type, int func, + unsigned long addr, unsigned long mask) +{ + u64 *buf64; + u32 *buf32; + + memset(rtas_errinjct_buf, 0, RTAS_ERRINJCT_BUF_SIZE); + buf64 =3D (u64 *)rtas_errinjct_buf; + buf32 =3D (u32 *)rtas_errinjct_buf; + + switch (type) { + case RTAS_ERR_TYPE_RECOVERED_SPECIAL_EVENT: + /* func must be 1 =3D non-persistent or 2 =3D persistent */ + if (func < 1 || func > 2) + return RTAS_INVALID_PARAMETER; + + if (validate_special_event(addr, mask)) + return RTAS_INVALID_PARAMETER; + + buf32[0] =3D cpu_to_be32(func); + break; + + case RTAS_ERR_TYPE_CORRUPTED_PAGE: + /* addr required: physical page address */ + if (addr =3D=3D 0) + return RTAS_INVALID_PARAMETER; + + if (validate_corrupted_page(pe, addr, mask)) + return RTAS_INVALID_PARAMETER; + + buf32[0] =3D cpu_to_be32(upper_32_bits(addr)); + buf32[1] =3D cpu_to_be32(lower_32_bits(addr)); + break; + + case RTAS_ERR_TYPE_IOA_BUS_ERROR: + /* 32-bit IOA bus error: addr/mask optional */ + if (func < EEH_ERR_FUNC_LD_MEM_ADDR || func > EEH_ERR_FUNC_MAX) + return RTAS_INVALID_PARAMETER; + + if (addr || mask) { + if (validate_ioa_bus_error(pe, addr, mask)) + return RTAS_INVALID_PARAMETER; + } + + buf32[0] =3D cpu_to_be32((u32)addr); + buf32[1] =3D cpu_to_be32((u32)mask); + buf32[2] =3D cpu_to_be32(pe->addr); + buf32[3] =3D cpu_to_be32(BUID_HI(pe->phb->buid)); + buf32[4] =3D cpu_to_be32(BUID_LO(pe->phb->buid)); + buf32[5] =3D cpu_to_be32(func); + break; + + case RTAS_ERR_TYPE_IOA_BUS_ERROR_64: + /* 64-bit IOA bus error: addr/mask optional */ + if (func < EEH_ERR_FUNC_MIN || func > EEH_ERR_FUNC_MAX) + return RTAS_INVALID_PARAMETER; + + if (addr || mask) { + if (validate_ioa_bus_error(pe, addr, mask)) + return RTAS_INVALID_PARAMETER; + } + + buf64[0] =3D cpu_to_be64(addr); + buf64[1] =3D cpu_to_be64(mask); + buf32[4] =3D cpu_to_be32(pe->addr); + buf32[5] =3D cpu_to_be32(BUID_HI(pe->phb->buid)); + buf32[6] =3D cpu_to_be32(BUID_LO(pe->phb->buid)); + buf32[7] =3D cpu_to_be32(func); + break; + + case RTAS_ERR_TYPE_CORRUPTED_DCACHE_START: + case RTAS_ERR_TYPE_CORRUPTED_DCACHE_END: + case RTAS_ERR_TYPE_CORRUPTED_ICACHE_START: + case RTAS_ERR_TYPE_CORRUPTED_ICACHE_END: + /* addr/mask optional, no strict validation */ + buf32[0] =3D cpu_to_be32(addr); + buf32[1] =3D cpu_to_be32(mask); + break; + + case RTAS_ERR_TYPE_CORRUPTED_TLB_START: + case RTAS_ERR_TYPE_CORRUPTED_TLB_END: + /* only addr field relevant */ + buf32[0] =3D cpu_to_be32(addr); + break; + + default: + pr_err("Unsupported error type 0x%x\n", type); + return -EINVAL; + } + + pr_debug("RTAS: errinjct buffer prepared: type=3D%d func=3D%d addr=3D0x%l= x mask=3D0x%lx\n", + type, func, addr, mask); + + return 0; +} + /** * pseries_eeh_err_inject - Inject specified error to the indicated PE * @pe: the indicated PE --=20 2.51.1 From nobody Fri Dec 19 16:00:43 2025 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BF044314B9D for ; Fri, 5 Dec 2025 13:46:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.156.1 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764942379; cv=none; b=ICJh9zaHJQCfBiHc6ZKt46mEiy/VfxLA09O+KaHPhal7bsp2BiJR8FysbyvramUYD8My7XAUhgWXv3NNk3z5I9VkblARdhuo6lxQTCU0w83MpRjglFgO76YoWbScVzR9j7USnSQFXx+WU73r545Hpp04dWN6pojiQALTrJZDbmY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764942379; c=relaxed/simple; bh=CKRtw1ZoP8T8p4fywBVru73HrukWbIe8WnF+fsfey0o=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HUzd3gIa2Y3+tmGnrLwR1pKb0OrWA0/CbHCnI0q8p8Ddm5foeZj46unM6Cm/Rd1lcIHE5HFNRMbOhyKiGP03P1D5qnCIIP8OoABFj4sz0+vcXdiS6kq6zBS0SlDH1178APy9Bg6yw5hckDfKAeNqpi7i91MnPMAGW2TNo3eDlh8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com; spf=pass smtp.mailfrom=linux.ibm.com; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b=VCMQs9VX; arc=none smtp.client-ip=148.163.156.1 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="VCMQs9VX" Received: from pps.filterd (m0353729.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 5B5CTooZ026295; Fri, 5 Dec 2025 13:45:58 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=2Wsjd5AJnhoSdRNqe 0Du1Qr+oQCkFLWon4cEEHpofr8=; b=VCMQs9VXofgIhS2ZdEbNQo7vFKFsRM/Yu U7eIDweOwVz+/Pm0du5mk2Dl9qwQ7bfVF1TzMInSMTpc9cnQg24EvqX9f+LgYK0I 5uIVlCpKN2ZbcV7jo1yu7VywYlWHItJO5C4NklFyc6JoHWMY/VBcuVUQ+kHPvnDL a0zAnetA00yCdjIDxa+UtEbBcUSIzDDWjKhThAVu1L1a36S9blJyjd0dtzLA//Op mCD2D7ogKS7GmyVvs7TuF2Uhet/z435ozAfhLqo6u4hcabYg/WM6t48XWcAJVunq ymakv+gppTwZjylNk9imPyzlHDIOuN9VbTaFyHHRt7fkkm4PxIzAQ== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4aqrh7dyrf-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 05 Dec 2025 13:45:58 +0000 (GMT) Received: from m0353729.ppops.net (m0353729.ppops.net [127.0.0.1]) by pps.reinject (8.18.1.12/8.18.0.8) with ESMTP id 5B5Debq3031580; Fri, 5 Dec 2025 13:45:57 GMT Received: from ppma12.dal12v.mail.ibm.com (dc.9e.1632.ip4.static.sl-reverse.com [50.22.158.220]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4aqrh7dyrb-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 05 Dec 2025 13:45:57 +0000 (GMT) Received: from pps.filterd (ppma12.dal12v.mail.ibm.com [127.0.0.1]) by ppma12.dal12v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 5B5ADXqj024111; Fri, 5 Dec 2025 13:45:55 GMT Received: from smtprelay06.fra02v.mail.ibm.com ([9.218.2.230]) by ppma12.dal12v.mail.ibm.com (PPS) with ESMTPS id 4arb5swmy8-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 05 Dec 2025 13:45:55 +0000 Received: from smtpav06.fra02v.mail.ibm.com (smtpav06.fra02v.mail.ibm.com [10.20.54.105]) by smtprelay06.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 5B5DjpnP14024980 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 5 Dec 2025 13:45:51 GMT Received: from smtpav06.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 79A992004B; Fri, 5 Dec 2025 13:45:51 +0000 (GMT) Received: from smtpav06.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 142B520040; Fri, 5 Dec 2025 13:45:49 +0000 (GMT) Received: from ltcd48-lp3.ltc.tadn.ibm.com (unknown [9.5.7.39]) by smtpav06.fra02v.mail.ibm.com (Postfix) with ESMTP; Fri, 5 Dec 2025 13:45:48 +0000 (GMT) From: Narayana Murty N To: mahesh@linux.ibm.com, maddy@linux.ibm.com, mpe@ellerman.id.au, christophe.leroy@csgroup.eu, gregkh@linuxfoundation.org, oohall@gmail.com, npiggin@gmail.com Cc: linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, tyreld@linux.ibm.com, vaibhav@linux.ibm.com, sbhat@linux.ibm.com, ganeshgr@linux.ibm.com, sourabhjain@linux.ibm.com Subject: [PATCH 4/4] powerpc/pseries: Implement RTAS error injection via pseries_eeh_err_inject Date: Fri, 5 Dec 2025 03:45:10 -0600 Message-ID: <20251205094510.4671-5-nnmlinux@linux.ibm.com> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251205094510.4671-1-nnmlinux@linux.ibm.com> References: <20251205094510.4671-1-nnmlinux@linux.ibm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Authority-Analysis: v=2.4 cv=dK+rWeZb c=1 sm=1 tr=0 ts=6932e216 cx=c_pps a=bLidbwmWQ0KltjZqbj+ezA==:117 a=bLidbwmWQ0KltjZqbj+ezA==:17 a=wP3pNCr1ah4A:10 a=VkNPw1HP01LnGYTKEx00:22 a=VwQbUJbxAAAA:8 a=VnNF1IyMAAAA:8 a=deTHFr3idxbnG05LXr8A:9 X-Proofpoint-GUID: _xAYc_x4bKY5roffsl_TdXnvvF7Qz0fL X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMTI5MDAyMCBTYWx0ZWRfX5YpbkRgUyHTi oKnQ2zA7LC7yza3NPE/5fnQofB4Kp31oib6G/RrrmVNupNew+fZQmJ4izkPTPDoRyii4X72rKVO CcJg412EhgUdN/ki9QtiBJTFcmcq1bqPVIwPs53jXA7CQk6bPDwIt0I/aH65lsdcXAXNlDcyUbN a5SsBcaMRPaDWX5fMvn5y3y1+W9kO0cgLGjHPxxullk6ecwBPUdEmJ7askP1cfiKzImJ1AbZyBg KkEEvx4fX121HdfKJ8WQ8jxZAmJarxDS2/+ub5sQi80BhRW09DuCCeZIl4mCs3PY1IYNhpV/NID Uc8TgnoYUSxYPEp7irHeWW+lhnyG2PEZ6zyBHzuq8G8ijgXGMl9m5dRSso1WtvDQsgQFrp6tceN C5TD3DscrSdp/OmLDD77bRRLZEm5Kw== X-Proofpoint-ORIG-GUID: nosvOfS3DPLu6Nav2U41FcrIKoWYqBTd X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.9,FMLib:17.12.100.49 definitions=2025-12-05_04,2025-12-04_04,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 lowpriorityscore=0 clxscore=1015 priorityscore=1501 bulkscore=0 adultscore=0 phishscore=0 impostorscore=0 spamscore=0 malwarescore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2510240000 definitions=main-2511290020 Content-Type: text/plain; charset="utf-8" Replace legacy MMIO error injection with full PAPR-compliant RTAS error injection supporting 14+ error types via - ibm,open-errinjct - ibm,errinjct - ibm,close-errinjct. Key features: - Complete open-session-inject-close cycle management - Special handling for ibm,open-errinjct output format (token,status) - Comprehensive buffer preparation per PAPR layouts - All pr_* logging uses pr_fmt("EEH: ") prefix Tested with corresponding QEMU patches: https://lore.kernel.org/all/20251029150618.186803-1-nnmlinux@linux.ibm.com/ Signed-off-by: Narayana Murty N --- arch/powerpc/platforms/pseries/eeh_pseries.c | 164 +++++++++++++++++-- 1 file changed, 146 insertions(+), 18 deletions(-) diff --git a/arch/powerpc/platforms/pseries/eeh_pseries.c b/arch/powerpc/pl= atforms/pseries/eeh_pseries.c index 110e8cf10985..d0010f2fc656 100644 --- a/arch/powerpc/platforms/pseries/eeh_pseries.c +++ b/arch/powerpc/platforms/pseries/eeh_pseries.c @@ -1047,6 +1047,98 @@ static int prepare_errinjct_buffer(struct eeh_pe *pe= , int type, int func, return 0; } =20 +/** + * rtas_open_errinjct_session - Open an RTAS error injection session + * + * Opens a session with the RTAS ibm,open-errinjct service. + * + * Return: Positive session token on success, negative error code on failu= re. + */ +static int rtas_open_errinjct_session(void) +{ + int open_token, args[2] =3D {0}; + int rc, status, session_token =3D -1; + + open_token =3D rtas_function_token(RTAS_FN_IBM_OPEN_ERRINJCT); + if (open_token =3D=3D RTAS_UNKNOWN_SERVICE) { + pr_err("RTAS: ibm,open-errinjct not available\n"); + return RTAS_UNKNOWN_SERVICE; + } + + /* Call open; original code treated rtas_call return as session token */ + rc =3D rtas_call(open_token, 0, 2, args); + status =3D args[1]; + if (status !=3D 0) { + pr_err("RTAS: open-errinjct failed: status=3D%d args[1]=3D%d rc=3D%d\n", + status, args[1], rc); + return status ? status : -EIO; + } + + session_token =3D args[0]; + pr_info("Opened injection session: token=3D%d\n", session_token); + return session_token; +} + +/** + * rtas_close_errinjct_session - Close an RTAS error injection session + * @session_token: Session token returned from open + * + * Attempts to close a previously opened error injection session. Best-eff= ort; + * logs warnings if close fails or if service is unavailable. + */ + +static void rtas_close_errinjct_session(int session_token) +{ + int close_token, args[2] =3D {0}; + + if (session_token <=3D 0) + return; + + close_token =3D rtas_function_token(RTAS_FN_IBM_CLOSE_ERRINJCT); + if (close_token =3D=3D RTAS_UNKNOWN_SERVICE) { + pr_warn("close-errinjct not available\n"); + return; + } + + args[0] =3D 0; + rtas_call(close_token, 1, 1, &session_token, args); + if (args[0]) { + pr_warn("close-errinjct args[0]=3D%d\n", args[0]); + } +} + +/** + * do_errinjct_call - Invoke the RTAS error injection service + * @errinjct_token: RTAS token for ibm,errinjct + * @type: RTAS error type + * @session_token: RTAS error injection session token + * + * Issues the RTAS ibm,errinjct call with the prepared work buffer. Logs e= rrors + * on failure. + * + * Return: 0 on success, negative error code otherwise. + */ + +static int do_errinjct_call(int errinjct_token, int type, int session_toke= n) +{ + int rc, status; + + if (errinjct_token =3D=3D RTAS_UNKNOWN_SERVICE) + return -ENODEV; + + /* errinjct takes: type, session_token, workbuf pointer (3 in), returns s= tatus */ + rc =3D rtas_call(errinjct_token, 3, 1, &status, type, session_token, + rtas_errinjct_buf); + + if (rc || status !=3D 0) { + pr_err("RTAS: errinjct failed: rc=3D%d, status=3D%d\n", rc, status); + return status ? status : -EIO; + } + + pr_info("RTAS: errinjct ok: rc=3D%d, status=3D%d\n", rc, status); + return 0; +} + /** * pseries_eeh_err_inject - Inject specified error to the indicated PE * @pe: the indicated PE @@ -1060,30 +1152,66 @@ static int prepare_errinjct_buffer(struct eeh_pe *p= e, int type, int func, static int pseries_eeh_err_inject(struct eeh_pe *pe, int type, int func, unsigned long addr, unsigned long mask) { - struct eeh_dev *pdev; + int rc =3D 0; + int session_token =3D -1; + int errinjct_token; =20 - /* Check on PCI error type */ - if (type !=3D EEH_ERR_TYPE_32 && type !=3D EEH_ERR_TYPE_64) - return -EINVAL; + /* Validate type */ + if (!validate_err_type(type)) { + pr_err("RTAS: invalid error type 0x%x\n", type); + return RTAS_INVALID_PARAMETER; + } + pr_debug("RTAS: error type 0x%x\n", type); =20 - switch (func) { - case EEH_ERR_FUNC_LD_MEM_ADDR: - case EEH_ERR_FUNC_LD_MEM_DATA: - case EEH_ERR_FUNC_ST_MEM_ADDR: - case EEH_ERR_FUNC_ST_MEM_DATA: - /* injects a MMIO error for all pdev's belonging to PE */ - pci_lock_rescan_remove(); - list_for_each_entry(pdev, &pe->edevs, entry) - eeh_pe_inject_mmio_error(pdev->pdev); - pci_unlock_rescan_remove(); - break; - default: - return -ERANGE; + /* For IOA bus errors we must validate err_func and addr/mask in PE. + * For other types: if addr/mask present we'll still validate BAR range; + * otherwise skip function checks. + */ + if (type =3D=3D RTAS_ERR_TYPE_IOA_BUS_ERROR || + type =3D=3D RTAS_ERR_TYPE_IOA_BUS_ERROR_64) { + /* Validate that addr/mask fall in the PE's BAR ranges */ + rc =3D validate_addr_mask_in_pe(pe, addr, mask); + if (rc) + return rc; + } else if (addr || mask) { + /* If caller provided addr/mask for a non-IOA type, do a BAR check too */ + rc =3D validate_addr_mask_in_pe(pe, addr, mask); + if (rc) + return rc; } =20 - return 0; + /* Open RTAS session */ + session_token =3D rtas_open_errinjct_session(); + if (session_token < 0) + return session_token; + + /* get errinjct token */ + errinjct_token =3D rtas_function_token(RTAS_FN_IBM_ERRINJCT); + if (errinjct_token =3D=3D RTAS_UNKNOWN_SERVICE) { + pr_err("RTAS: ibm,errinjct not available\n"); + rc =3D -ENODEV; + goto out_close; + } + + /* prepare shared buffer while holding lock */ + spin_lock(&rtas_errinjct_buf_lock); + rc =3D prepare_errinjct_buffer(pe, type, func, addr, mask); + if (rc) { + spin_unlock(&rtas_errinjct_buf_lock); + goto out_close; + } + + /* perform the errinjct RTAS call */ + rc =3D do_errinjct_call(errinjct_token, type, session_token); + spin_unlock(&rtas_errinjct_buf_lock); + +out_close: + /* always attempt close if we opened a session */ + rtas_close_errinjct_session(session_token); + return rc; } =20 + static struct eeh_ops pseries_eeh_ops =3D { .name =3D "pseries", .probe =3D pseries_eeh_probe, --=20 2.51.1