{"id":2218908,"url":"http://patchwork.ozlabs.org/api/1.0/patches/2218908/?format=json","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.0/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20260402022921.298818-16-kshk@linux.ibm.com>","date":"2026-04-02T02:29:21","name":"[15/15] s390x/pci: Create function to contain fmb_timer start","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"c38c8cccb3c06ee54bc313621b42330cc201ff53","submitter":{"id":90249,"url":"http://patchwork.ozlabs.org/api/1.0/people/90249/?format=json","name":"Konstantin Shkolnyy","email":"kshk@linux.ibm.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260402022921.298818-16-kshk@linux.ibm.com/mbox/","series":[{"id":498419,"url":"http://patchwork.ozlabs.org/api/1.0/series/498419/?format=json","date":"2026-04-02T02:29:08","name":"s390x/pci: Implement migration for emulated devices","version":1,"mbox":"http://patchwork.ozlabs.org/series/498419/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2218908/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=ibm.com header.i=@ibm.com header.a=rsa-sha256\n header.s=pp1 header.b=ku77+dM1;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org\n (client-ip=209.51.188.17; helo=lists.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=patchwork.ozlabs.org)"],"Received":["from lists.gnu.org (lists.gnu.org [209.51.188.17])\n\t(using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4fmQqb66FXz1yGH\n\tfor ; Thu, 02 Apr 2026 13:32:27 +1100 (AEDT)","from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from )\n\tid 1w87pW-0004lZ-I4; Wed, 01 Apr 2026 22:30:46 -0400","from eggs.gnu.org ([2001:470:142:3::10])\n by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from )\n id 1w87p3-0004Og-PK; Wed, 01 Apr 2026 22:30:21 -0400","from mx0b-001b2d01.pphosted.com ([148.163.158.5])\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from )\n id 1w87ou-0001zc-TE; Wed, 01 Apr 2026 22:30:10 -0400","from pps.filterd (m0353725.ppops.net [127.0.0.1])\n by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id\n 631HmLoU3128138; Thu, 2 Apr 2026 02:30:03 GMT","from ppma11.dal12v.mail.ibm.com\n (db.9e.1632.ip4.static.sl-reverse.com [50.22.158.219])\n by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4d65dcj6df-1\n (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT);\n Thu, 02 Apr 2026 02:30:03 +0000 (GMT)","from pps.filterd (ppma11.dal12v.mail.ibm.com [127.0.0.1])\n by ppma11.dal12v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id\n 6321O8AM008703;\n Thu, 2 Apr 2026 02:30:02 GMT","from smtprelay04.dal12v.mail.ibm.com ([172.16.1.6])\n by ppma11.dal12v.mail.ibm.com (PPS) with ESMTPS id 4d6v11r44e-1\n (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT);\n Thu, 02 Apr 2026 02:30:02 +0000","from smtpav06.wdc07v.mail.ibm.com (smtpav06.wdc07v.mail.ibm.com\n [10.39.53.233])\n by smtprelay04.dal12v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id\n 6322U1k426411562\n (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK);\n Thu, 2 Apr 2026 02:30:01 GMT","from smtpav06.wdc07v.mail.ibm.com (unknown [127.0.0.1])\n by IMSVA (Postfix) with ESMTP id 69C18580F4;\n Thu, 2 Apr 2026 02:30:01 +0000 (GMT)","from smtpav06.wdc07v.mail.ibm.com (unknown [127.0.0.1])\n by IMSVA (Postfix) with ESMTP id D5DE4580F6;\n Thu, 2 Apr 2026 02:30:00 +0000 (GMT)","from WIN-DU0DFC9G5VV.ibm.com (unknown [9.61.247.119])\n by smtpav06.wdc07v.mail.ibm.com (Postfix) with ESMTP;\n Thu, 2 Apr 2026 02:30:00 +0000 (GMT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc\n :content-transfer-encoding:date:from:in-reply-to:message-id\n :mime-version:references:subject:to; s=pp1; bh=b8UsqEhWMdLSrJ83v\n E86UE+4bGE1qV2cE0PriPUBNJA=; b=ku77+dM1o3pp/DR9sCknEEbzcBSC4lTo1\n 9zVfP0dSfbLG49W3B3yaChHmg39zM662iKXD7zrOlyiR7Sr6qHQGPWaCzGSsUVZv\n c2V4SgpACFPlEA2LMr+soMbFrXHR3wzhjEvt8tPvhvMRaZksrePzlj/nLmaehWug\n 2Vatqnk0fL4OUrCG1PVaLsBZvaMrZt4fZWuIKFlwcaZ9EAW065IXmW/MnvMmN6Jf\n bjeL08IUDWo6Losa8zdT3aW0hqAgdEQUm/4QPDJIlyDlx7O7lT2NaIU+IhOD16FR\n M4pB0wjzCrUX7wVMLkVjHeBWdNLGO3qa+UYc3EhA7GhwXzOXv4JQg==","From":"Konstantin Shkolnyy ","To":"mjrosato@linux.ibm.com","Cc":"alifm@linux.ibm.com, richard.henderson@linaro.org, iii@linux.ibm.com,\n david@kernel.org, cohuck@redhat.com, pasic@linux.ibm.com,\n borntraeger@linux.ibm.com, qemu-s390x@nongnu.org,\n qemu-devel@nongnu.org, Konstantin Shkolnyy ","Subject":"[PATCH 15/15] s390x/pci: Create function to contain fmb_timer start","Date":"Wed, 1 Apr 2026 21:29:21 -0500","Message-Id":"<20260402022921.298818-16-kshk@linux.ibm.com>","X-Mailer":"git-send-email 2.34.1","In-Reply-To":"<20260402022921.298818-1-kshk@linux.ibm.com>","References":"<20260402022921.298818-1-kshk@linux.ibm.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","X-TM-AS-GCONF":"00","X-Authority-Analysis":"v=2.4 cv=RsjI7SmK c=1 sm=1 tr=0 ts=69cdd4ab cx=c_pps\n a=aDMHemPKRhS1OARIsFnwRA==:117 a=aDMHemPKRhS1OARIsFnwRA==:17\n a=A5OVakUREuEA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22\n a=V8glGbnc2Ofi9Qvn3v5h:22 a=VnNF1IyMAAAA:8 a=7DrABjzRcPR44fYl4i4A:9","X-Proofpoint-GUID":"3kQW5gHHoFCKSOAwqAq50gJV67V_ooCG","X-Proofpoint-Spam-Details-Enc":"AW1haW4tMjYwNDAyMDAxOSBTYWx0ZWRfXxM1JCWYabEjw\n uqfIKKWo3IWlyAfrVtwq44+u8d3bpRX6xu7i5wbiWdqSk1oqUadIBVVm5eksSha1otKUzVk4tP/\n 99TfCtjaOrtbriZnDwTwHz+tf0KvvvoeQlZP+WXL3i86yQXXJ8YEjgfgmMmzSjRixVitqt8qQ83\n Fnx2fUC6RS59PF8Rn64RSqICNVNJCRxkwcVB+C1pLj09MoWzm12V628vrrv31SNYw4ghDbsdWtU\n swXNwAO+Hmu2dYcBANw/p8Gxv0yjiiFxA1uqor4Nd+6ztblVhNvsP9Bd2ShzzYtwikWI7At8RKb\n ML7Gw2NMJHFqmZGRaaKf6N2rwQYskwZDplXR3hOPr15lxqBG2cWJXyJBJfaaeR5+ePhHWL5A2XC\n X7Oq2H/ugxF3hWNBC3mu935iatXIVXOrBobCpYFm3eTzoGu5YU16iRZ4O9MO2BXrCKhPHoQG8iW\n RvPX7KIHweO+tvgu/Rg==","X-Proofpoint-ORIG-GUID":"3kQW5gHHoFCKSOAwqAq50gJV67V_ooCG","X-Proofpoint-Virus-Version":"vendor=baseguard\n engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49\n definitions=2026-04-01_05,2026-04-01_02,2025-10-01_01","X-Proofpoint-Spam-Details":"rule=outbound_notspam policy=outbound score=0\n impostorscore=0 bulkscore=0 priorityscore=1501 lowpriorityscore=0\n suspectscore=0 malwarescore=0 spamscore=0 clxscore=1015 phishscore=0\n adultscore=0 classifier=typeunknown authscore=0 authtc= authcc=\n route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2603050001\n definitions=main-2604020019","Received-SPF":"pass client-ip=148.163.158.5; envelope-from=kshk@linux.ibm.com;\n helo=mx0b-001b2d01.pphosted.com","X-Spam_score_int":"-6","X-Spam_score":"-0.7","X-Spam_bar":"/","X-Spam_report":"(-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,\n DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7,\n RCVD_IN_MSPIKE_H4=-0.01, RCVD_IN_MSPIKE_WL=-0.01,\n RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=1, RCVD_IN_VALIDITY_RPBL_BLOCKED=1,\n SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no","X-Spam_action":"no action","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"qemu development ","List-Unsubscribe":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org"},"content":"fmb_timer is now started in 3 different places. The new function will encapsulate\nthat to make sure mui is added in all cases.\n\nSigned-off-by: Konstantin Shkolnyy \n---\n hw/s390x/s390-pci-bus.c | 5 ++---\n hw/s390x/s390-pci-inst.c | 14 ++++++++++----\n include/hw/s390x/s390-pci-bus.h | 1 +\n 3 files changed, 13 insertions(+), 7 deletions(-)","diff":"diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c\nindex b3037b9a8a..1451dbd340 100644\n--- a/hw/s390x/s390-pci-bus.c\n+++ b/hw/s390x/s390-pci-bus.c\n@@ -1658,9 +1658,8 @@ static int s390_pci_device_post_load(void *opaque, int version_id)\n assert(pbdev->pci_group);\n pbdev->fmb_timer = timer_new_ms(QEMU_CLOCK_VIRTUAL,\n fmb_update, pbdev);\n- timer_mod(pbdev->fmb_timer,\n- qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL) +\n- pbdev->pci_group->zpci_group.mui);\n+ s390_pci_schedule_fmb_timer(pbdev,\n+ qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL));\n }\n return 0;\n }\ndiff --git a/hw/s390x/s390-pci-inst.c b/hw/s390x/s390-pci-inst.c\nindex a9c0a4effb..62ecd50dcb 100644\n--- a/hw/s390x/s390-pci-inst.c\n+++ b/hw/s390x/s390-pci-inst.c\n@@ -1094,9 +1094,16 @@ static int fmb_do_update(S390PCIBusDevice *pbdev, int offset, uint64_t val,\n return ret;\n }\n \n+void s390_pci_schedule_fmb_timer(S390PCIBusDevice *pbdev, uint64_t start)\n+{\n+ timer_mod(pbdev->fmb_timer, start + pbdev->pci_group->zpci_group.mui);\n+}\n+\n void fmb_update(void *opaque)\n {\n S390PCIBusDevice *pbdev = opaque;\n+\n+ /* Must be read before updating U bit */\n int64_t t = qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL);\n int i;\n \n@@ -1133,7 +1140,7 @@ void fmb_update(void *opaque)\n sizeof(pbdev->fmb.last_update))) {\n return;\n }\n- timer_mod(pbdev->fmb_timer, t + pbdev->pci_group->zpci_group.mui);\n+ s390_pci_schedule_fmb_timer(pbdev, t);\n }\n \n static int mpcifc_reg_int_interp(S390PCIBusDevice *pbdev, ZpciFib *fib)\n@@ -1326,9 +1333,8 @@ int mpcifc_service_call(S390CPU *cpu, uint8_t r1, uint64_t fiba, uint8_t ar,\n timer_del(pbdev->fmb_timer);\n }\n pbdev->fmb_addr = fmb_addr;\n- timer_mod(pbdev->fmb_timer,\n- qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL) +\n- pbdev->pci_group->zpci_group.mui);\n+ s390_pci_schedule_fmb_timer(pbdev,\n+ qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL));\n break;\n }\n default:\ndiff --git a/include/hw/s390x/s390-pci-bus.h b/include/hw/s390x/s390-pci-bus.h\nindex 2edb023112..966ae3ade5 100644\n--- a/include/hw/s390x/s390-pci-bus.h\n+++ b/include/hw/s390x/s390-pci-bus.h\n@@ -417,5 +417,6 @@ S390PCIBusDevice *s390_pci_find_next_avail_dev(S390pciState *s,\n S390PCIBusDevice *pbdev);\n void s390_pci_ism_reset(void);\n void fmb_update(void *opaque);\n+void s390_pci_schedule_fmb_timer(S390PCIBusDevice *pbdev, uint64_t start);\n \n #endif\n","prefixes":["15/15"]}