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 E18BBC54754 for ; Thu, 15 May 2025 15:49:58 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uFapi-0003MP-FE; Thu, 15 May 2025 11:49:18 -0400 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 1uFape-000374-7b; Thu, 15 May 2025 11:49:14 -0400 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 1uFapX-0006j8-Am; Thu, 15 May 2025 11:49:13 -0400 Received: from pps.filterd (m0356517.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 54FCgOjZ013039; Thu, 15 May 2025 15:49:03 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=csJpki Gikdp4algLrwC5/S1DHalsppv1c1+bLigCPJA=; b=KE24dmrQi1IZRtIWQ6JAsf TfJdpqFuKV86slPBYJEBM8TqQwws7P8JNJpAccEOuDn6e9NGciwCxgSMX5ZbQhN7 lkTfPV8Q0PPrIqdv4F66nwMUEt4cwlnCWKcL1rNp6dFofRo1/jS62ZtnJi9woZR0 uYWf+IL/14SriQqK13H0jzGwrVFR4obGJmiNrxz+ktMHxFON6aVhPCkAkgBqE89F HTlmmwp6uSGm9XRDET7qE+UyBD+w8/fLc6T0Z+RSB6K/GDRTVcdCdpcgT9SjY7gF MHsLnMdblpw4iRc8dqWk4zcd0qaKlOQzKmUIJFVsdKCtOMxCX7OlS2uNi+PezsqQ == Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 46n0t9djeq-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 15 May 2025 15:49:03 +0000 (GMT) Received: from m0356517.ppops.net (m0356517.ppops.net [127.0.0.1]) by pps.reinject (8.18.0.8/8.18.0.8) with ESMTP id 54FFdxCM020911; Thu, 15 May 2025 15:49:02 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 46n0t9djen-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 15 May 2025 15:49:02 +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 54FEHtSj019451; Thu, 15 May 2025 15:49:02 GMT Received: from smtprelay05.wdc07v.mail.ibm.com ([172.16.1.72]) by ppma13.dal12v.mail.ibm.com (PPS) with ESMTPS id 46mbfru22c-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 15 May 2025 15:49:02 +0000 Received: from smtpav01.dal12v.mail.ibm.com (smtpav01.dal12v.mail.ibm.com [10.241.53.100]) by smtprelay05.wdc07v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 54FFmxZw32703004 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 15 May 2025 15:49:00 GMT Received: from smtpav01.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id CA68858058; Thu, 15 May 2025 15:48:59 +0000 (GMT) Received: from smtpav01.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 7AE8C58057; Thu, 15 May 2025 15:48:59 +0000 (GMT) Received: from [9.10.80.143] (unknown [9.10.80.143]) by smtpav01.dal12v.mail.ibm.com (Postfix) with ESMTP; Thu, 15 May 2025 15:48:59 +0000 (GMT) Message-ID: <6f01f4f0-3238-4f36-b237-cffb4d23b488@linux.ibm.com> Date: Thu, 15 May 2025 10:48:58 -0500 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 44/50] ppc/xive2: Implement pool context push TIMA op To: Nicholas Piggin , qemu-ppc@nongnu.org Cc: qemu-devel@nongnu.org, =?UTF-8?B?RnLDqWTDqXJpYyBCYXJyYXQ=?= , Glenn Miles , Caleb Schlossin References: <20250512031100.439842-1-npiggin@gmail.com> <20250512031100.439842-45-npiggin@gmail.com> Content-Language: en-US From: Mike Kowal In-Reply-To: <20250512031100.439842-45-npiggin@gmail.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Authority-Analysis: v=2.4 cv=etzfzppX c=1 sm=1 tr=0 ts=68260cef cx=c_pps a=AfN7/Ok6k8XGzOShvHwTGQ==:117 a=AfN7/Ok6k8XGzOShvHwTGQ==:17 a=IkcTkHD0fZMA:10 a=dt9VzEwgFbYA:10 a=VnNF1IyMAAAA:8 a=pGLkceISAAAA:8 a=gW-wZIP8OrGeN4NDwrQA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNTE1MDE1NSBTYWx0ZWRfXx1ntons0mgNZ MTvRsFLWAtU9+2KQ/89DCnMpI5hAcTWI9Z4ufzqpQw+I6NiC+RTuTMKTgIRqFVVkkJOvjQhbwEQ /UZSirSJB/UZRCXojdhhIlfWUeFZYfdMELq1+6x/PDZKvUVfcwSfoLd37gt5ew0zePp50Kqs+Kq qiarMNrFtndkglgE3qrcalv1GDTlr0qTgDTekQf6HLscQ2QZ6bYwVGFaF2soqA19fqT519pEov7 GNSzpmVdizwUA/flsAib9RIMMzfLuOoxIOclCfMrxq3ve6NCZPhqPVbASMQZ8dN4rKSnYe+tty7 b9RmrXWz4pxC42IdROuQSInzgRcS6pffvtFfx9JIwGy6nbEJ9AdrhiftNUUXzr7F4aCtJwGnx0j LhxaV16jfx+cgQImQQS3AnA5t3LLS4RsvLJnb1RYlpBGDuL48HGmSet7AJILbA9djvSidn6V X-Proofpoint-ORIG-GUID: 5aBiL7WkOPXH7cOYc7KMQnON-T7nfU8r X-Proofpoint-GUID: wE7VtEOZr3q5muLMr1rDNrMdZpayAWX_ X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.736,FMLib:17.12.80.40 definitions=2025-05-15_06,2025-05-15_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 lowpriorityscore=0 phishscore=0 mlxscore=0 mlxlogscore=882 bulkscore=0 suspectscore=0 spamscore=0 clxscore=1015 priorityscore=1501 malwarescore=0 adultscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505070000 definitions=main-2505150155 Received-SPF: pass client-ip=148.163.156.1; envelope-from=kowal@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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_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 5/11/2025 10:10 PM, Nicholas Piggin wrote: > Implement pool context push TIMA op. Reviewed-by: Michael Kowal Thanks,  MAK > > Signed-off-by: Nicholas Piggin > --- > hw/intc/xive.c | 4 ++++ > hw/intc/xive2.c | 50 ++++++++++++++++++++++++++++-------------- > include/hw/ppc/xive2.h | 2 ++ > 3 files changed, 39 insertions(+), 17 deletions(-) > > diff --git a/hw/intc/xive.c b/hw/intc/xive.c > index d5bbd8f4c6..979031a587 100644 > --- a/hw/intc/xive.c > +++ b/hw/intc/xive.c > @@ -733,6 +733,10 @@ static const XiveTmOp xive2_tm_operations[] = { > xive2_tm_push_os_ctx, NULL }, > { XIVE_TM_OS_PAGE, TM_QW1_OS + TM_LGS, 1, true, true, > xive_tm_set_os_lgs, NULL }, > + { XIVE_TM_HV_PAGE, TM_QW2_HV_POOL + TM_WORD2, 4, true, true, > + xive2_tm_push_pool_ctx, NULL }, > + { XIVE_TM_HV_PAGE, TM_QW2_HV_POOL + TM_WORD2, 8, true, true, > + xive2_tm_push_pool_ctx, NULL }, > { XIVE_TM_HV_PAGE, TM_QW3_HV_PHYS + TM_CPPR, 1, true, true, > xive2_tm_set_hv_cppr, NULL }, > { XIVE_TM_HV_PAGE, TM_QW3_HV_PHYS + TM_WORD2, 1, true, true, > diff --git a/hw/intc/xive2.c b/hw/intc/xive2.c > index 917ecbaae4..21cd07df68 100644 > --- a/hw/intc/xive2.c > +++ b/hw/intc/xive2.c > @@ -583,6 +583,7 @@ static void xive2_tctx_save_ctx(Xive2Router *xrtr, XiveTCTX *tctx, > xive2_router_write_nvp(xrtr, nvp_blk, nvp_idx, &nvp, 1); > } > > +/* POOL cam is the same as OS cam encoding */ > static void xive2_cam_decode(uint32_t cam, uint8_t *nvp_blk, > uint32_t *nvp_idx, bool *valid, bool *hw) > { > @@ -940,10 +941,11 @@ static uint8_t xive2_tctx_restore_ctx(Xive2Router *xrtr, XiveTCTX *tctx, > } > > static void xive2_tctx_need_resend(Xive2Router *xrtr, XiveTCTX *tctx, > + uint8_t ring, > uint8_t nvp_blk, uint32_t nvp_idx, > bool do_restore) > { > - uint8_t *regs = &tctx->regs[TM_QW1_OS]; > + uint8_t *regs = &tctx->regs[ring]; > uint8_t ipb; > Xive2Nvp nvp; > > @@ -965,7 +967,7 @@ static void xive2_tctx_need_resend(Xive2Router *xrtr, XiveTCTX *tctx, > > /* Automatically restore thread context registers */ > if (xive2_router_get_config(xrtr) & XIVE2_VP_SAVE_RESTORE && do_restore) { > - xive2_tctx_restore_ctx(xrtr, tctx, TM_QW1_OS, nvp_blk, nvp_idx, &nvp); > + xive2_tctx_restore_ctx(xrtr, tctx, ring, nvp_blk, nvp_idx, &nvp); > } > > ipb = xive_get_field32(NVP2_W2_IPB, nvp.w2); > @@ -976,48 +978,62 @@ static void xive2_tctx_need_resend(Xive2Router *xrtr, XiveTCTX *tctx, > /* IPB bits in the backlog are merged with the TIMA IPB bits */ > regs[TM_IPB] |= ipb; > > - xive2_tctx_process_pending(tctx, TM_QW1_OS); > + xive2_tctx_process_pending(tctx, ring == TM_QW2_HV_POOL ? > + TM_QW3_HV_PHYS : ring); > } > > /* > - * Updating the OS CAM line can trigger a resend of interrupt > + * Updating the ring CAM line can trigger a resend of interrupt > */ > -void xive2_tm_push_os_ctx(XivePresenter *xptr, XiveTCTX *tctx, > - hwaddr offset, uint64_t value, unsigned size) > +static void xive2_tm_push_ctx(XivePresenter *xptr, XiveTCTX *tctx, > + hwaddr offset, uint64_t value, unsigned size, > + uint8_t ring) > { > uint32_t cam; > - uint32_t qw1w2; > - uint64_t qw1dw1; > + uint32_t w2; > + uint64_t dw1; > uint8_t nvp_blk; > uint32_t nvp_idx; > - bool vo; > + bool v; > bool do_restore; > > /* First update the thead context */ > switch (size) { > case 4: > cam = value; > - qw1w2 = cpu_to_be32(cam); > - memcpy(&tctx->regs[TM_QW1_OS + TM_WORD2], &qw1w2, 4); > + w2 = cpu_to_be32(cam); > + memcpy(&tctx->regs[ring + TM_WORD2], &w2, 4); > break; > case 8: > cam = value >> 32; > - qw1dw1 = cpu_to_be64(value); > - memcpy(&tctx->regs[TM_QW1_OS + TM_WORD2], &qw1dw1, 8); > + dw1 = cpu_to_be64(value); > + memcpy(&tctx->regs[ring + TM_WORD2], &dw1, 8); > break; > default: > g_assert_not_reached(); > } > > - xive2_cam_decode(cam, &nvp_blk, &nvp_idx, &vo, &do_restore); > + xive2_cam_decode(cam, &nvp_blk, &nvp_idx, &v, &do_restore); > > /* Check the interrupt pending bits */ > - if (vo) { > - xive2_tctx_need_resend(XIVE2_ROUTER(xptr), tctx, nvp_blk, nvp_idx, > - do_restore); > + if (v) { > + xive2_tctx_need_resend(XIVE2_ROUTER(xptr), tctx, ring, > + nvp_blk, nvp_idx, do_restore); > } > } > > +void xive2_tm_push_os_ctx(XivePresenter *xptr, XiveTCTX *tctx, > + hwaddr offset, uint64_t value, unsigned size) > +{ > + xive2_tm_push_ctx(xptr, tctx, offset, value, size, TM_QW1_OS); > +} > + > +void xive2_tm_push_pool_ctx(XivePresenter *xptr, XiveTCTX *tctx, > + hwaddr offset, uint64_t value, unsigned size) > +{ > + xive2_tm_push_ctx(xptr, tctx, offset, value, size, TM_QW2_HV_POOL); > +} > + > /* returns -1 if ring is invalid, but still populates block and index */ > static int xive2_tctx_get_nvp_indexes(XiveTCTX *tctx, uint8_t ring, > uint8_t *nvp_blk, uint32_t *nvp_idx) > diff --git a/include/hw/ppc/xive2.h b/include/hw/ppc/xive2.h > index a91b99057c..c1ab06a55a 100644 > --- a/include/hw/ppc/xive2.h > +++ b/include/hw/ppc/xive2.h > @@ -140,6 +140,8 @@ bool xive2_tm_irq_precluded(XiveTCTX *tctx, int ring, uint8_t priority); > void xive2_tm_set_lsmfb(XiveTCTX *tctx, int ring, uint8_t priority); > void xive2_tm_set_hv_target(XivePresenter *xptr, XiveTCTX *tctx, > hwaddr offset, uint64_t value, unsigned size); > +void xive2_tm_push_pool_ctx(XivePresenter *xptr, XiveTCTX *tctx, > + hwaddr offset, uint64_t value, unsigned size); > uint64_t xive2_tm_pull_pool_ctx(XivePresenter *xptr, XiveTCTX *tctx, > hwaddr offset, unsigned size); > uint64_t xive2_tm_pull_phys_ctx(XivePresenter *xptr, XiveTCTX *tctx,