From nobody Mon Oct 27 11:22:12 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1761464998; cv=none; d=zohomail.com; s=zohoarc; b=K39N5q8WRCuUORyXCGo3+ezbl4Y9tqlr61kxncl87ov1f1Z2mcwyjPmDB/MZl0aq4EXQq65nujFvlmH+nB0VNdC+o6FbTert5eoWsAb74Dh4Mg6EltTcxrymMmKb+waho9N9yKKGKGJ/017O/8w+fPpH/lCSG62IpCoiRpD8wqg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761464998; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=G/oYF7H1MNrp4EDiT8ChUrBUiR5J7jFia5NcsuMMXDQ=; b=egQjKob8d7Ms+xHoqzYDExqGqRBiPwkvpHOX9TO90TNkZ3tgTN3S7Gkb2YhCcz5qBg4UbDeMgGZgoZvWH3mXfOdC9G70GCAOHy3Zf1zqlptsCgMdA8mnz0mvQet/3n8oSXYFFHaDiZ+WAXerq8VG93hgd039MFxzgL3opNVhY/8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1761464998393715.832541192859; Sun, 26 Oct 2025 00:49:58 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vCvUw-00065s-C2; Sun, 26 Oct 2025 03:49:06 -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 1vCvUu-00065I-Q5 for qemu-devel@nongnu.org; Sun, 26 Oct 2025 03:49:04 -0400 Received: from mail-pl1-x631.google.com ([2607:f8b0:4864:20::631]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vCvUs-0003c3-Ri for qemu-devel@nongnu.org; Sun, 26 Oct 2025 03:49:04 -0400 Received: by mail-pl1-x631.google.com with SMTP id d9443c01a7336-29301049db3so5803605ad.0 for ; Sun, 26 Oct 2025 00:49:02 -0700 (PDT) Received: from fedora ([2409:40f2:1162:986e:b8ab:55e2:7dea:929a]) by smtp.googlemail.com with ESMTPSA id d9443c01a7336-29498e46664sm42987625ad.109.2025.10.26.00.48.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Oct 2025 00:49:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1761464941; x=1762069741; darn=nongnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=G/oYF7H1MNrp4EDiT8ChUrBUiR5J7jFia5NcsuMMXDQ=; b=Fw6iVZSg1ZxMUbwtYFxcAWBh7jeLm0HBXQOKAUki7KXIAGU94tiuxnoFCUha0o4J5a wn4PBmQvHhr/yGYAdOuYlH+qgtFsHI7cjQFe6xD+6sxSSWVTXDBDnOgTcCEtj8aBJveQ Z0yPqQx6hQSyfqU2o83G34+HKVT+mUCB0Q73T0JpkHx4eWWiOjOfXzgCaZsb6I9Lyth1 xnC62lzfP3h1orprQQw111qlrDeA9I5BrX/bxihTpodmKWzAk4dwK6O+CQMCILC+D6eV o6fA8nTBa4I8yBl4YagHD8U/FFUFmgCgv1Bxz3ytCbaQ/bNArNhg/YpA93ky5j4HBpnj R90w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761464941; x=1762069741; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=G/oYF7H1MNrp4EDiT8ChUrBUiR5J7jFia5NcsuMMXDQ=; b=Tt9ywV3JvvZ2OczsnonSQROwdchIcHGlGKvAIGxUCOn4ToRzF/0FSSemnFa7RTurC1 WpaeYKSJidvFmQv0Fyl86guGxaWjr/b1cUMHv2nxac7W5VY+Yhmy7TqZ9Ly9yL3YlP2U 4I8tjN/Mteiq+hN3zaee7m4gTkoN+TeDg41iJbOOYRhFZH6yg8sqLnZf1EonD48NRVYm +w9N/JSFt5Uitro8OvRFRj4YQL1jwrifhDRDIjF/0yeS3MCtl9dmVmFSnjjZeBVfqFQw pRT91AM/80gcvS75G+hk09MqNVL6Kqs1Bi9mHYWZkgcfDPST4j958eTq6xH3x0+RSy2V /fuw== X-Forwarded-Encrypted: i=1; AJvYcCX8zo3i5WEUD5gFMvDulGRSRPppCTCICU+5ztrCiCcaxugyT3vzGdLDjwMliQx/1yiWmec1GyXGQCS6@nongnu.org X-Gm-Message-State: AOJu0Yw98zhTCgt3pGwFzCT4eh++IQsrH0oDXRwXSEC2Rhmd1LquHOJe +Ek7zSexq31SYepXNk9HOveAcThd8FZTYpxr6uQZOUvyw56OQQTqww9m X-Gm-Gg: ASbGncviQsaV1ajGHKHYlkFw8uNXwUC/soveaMuR5DrdZaF11rMioXpIpzEEkrlK1ju a9S+EqbaRIQsbtK/X7ituZjt/j/KgHU/W/DQhye+OcFcn0dqAuqSz3U/BYefEaJN1u948c9qRPF Jvh0zbRLc1E2tO1PdR7SaVLftZXQeuJebt3B2kQHavukO0zZ5b7KxQJ7MegNCspmlVIabIPbZlS 4D8ySdYPx91uOEXMdtSvYtv0kbqs+9jh8r8maOFTbF3/iVKM4Qb/L52OL7iC570ZraCJ+LsbAxK P9kEwtdKOm+FXfCv/SIESIvKMFZSHv6lMruwBslTR8+NtwrJc37XNHaSVtAVhJeRCxrGwNMVPWC EH83tnsTlMbUTN9xBLANGCWzMBfoSa1kbNOe+u8sc7JpyQSSPn8aeBlb6kzSftt7mJq/4/XS7W8 bQG/3ePPoc X-Google-Smtp-Source: AGHT+IF23XD1vacgvcpD2HE01KSIzFvqT6rQ70eVYUUQn4QsHTrecd40K4MCG54mMb61iFzNDXx/vQ== X-Received: by 2002:a17:903:94e:b0:26a:3c75:5241 with SMTP id d9443c01a7336-292d3fcce91mr130490955ad.9.1761464941084; Sun, 26 Oct 2025 00:49:01 -0700 (PDT) From: Yoges Vyas To: qemu-ppc@nongnu.org, rathc@linux.ibm.com, philmd@linaro.org Cc: npiggin@gmail.com, harshpb@linux.ibm.com, qemu-devel@nongnu.org, Yoges Vyas Subject: [PATCH] ppc/spapr: Cleanup MSI IRQ number handling Date: Sun, 26 Oct 2025 13:18:52 +0530 Message-ID: <20251026074852.53691-1-yvyas1991@gmail.com> X-Mailer: git-send-email 2.51.0 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::631; envelope-from=yvyas1991@gmail.com; helo=mail-pl1-x631.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1761465002135154100 Content-Type: text/plain; charset="utf-8" Now that spapr_irq_nr_msis() returns a constant value, lets replace it with a macro. Ref: https://lore.kernel.org/qemu-devel/bf149815-9782-4964-953d-73658b1043c= 9@linux.ibm.com/ Suggested-by: Chinmay Rath Signed-off-by: Yogesh Vyas --- hw/ppc/spapr_irq.c | 7 +------ hw/ppc/spapr_pci.c | 2 +- include/hw/ppc/spapr_irq.h | 2 +- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/hw/ppc/spapr_irq.c b/hw/ppc/spapr_irq.c index 2ce323457b..fc45a5d5d6 100644 --- a/hw/ppc/spapr_irq.c +++ b/hw/ppc/spapr_irq.c @@ -33,7 +33,7 @@ static const TypeInfo spapr_intc_info =3D { =20 static void spapr_irq_msi_init(SpaprMachineState *spapr) { - spapr->irq_map_nr =3D spapr_irq_nr_msis(spapr); + spapr->irq_map_nr =3D SPAPR_IRQ_NR_MSIS; spapr->irq_map =3D bitmap_new(spapr->irq_map_nr); } =20 @@ -277,11 +277,6 @@ void spapr_irq_dt(SpaprMachineState *spapr, uint32_t n= r_servers, sicc->dt(spapr->active_intc, nr_servers, fdt, phandle); } =20 -uint32_t spapr_irq_nr_msis(SpaprMachineState *spapr) -{ - return SPAPR_NR_XIRQS + SPAPR_XIRQ_BASE - SPAPR_IRQ_MSI; -} - void spapr_irq_init(SpaprMachineState *spapr, Error **errp) { if (kvm_enabled() && kvm_kernel_irqchip_split()) { diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c index bdec8f0728..d596a9e38e 100644 --- a/hw/ppc/spapr_pci.c +++ b/hw/ppc/spapr_pci.c @@ -2279,7 +2279,7 @@ int spapr_dt_phb(SpaprMachineState *spapr, SpaprPhbSt= ate *phb, _FDT(fdt_setprop(fdt, bus_off, "reg", &bus_reg, sizeof(bus_reg))); _FDT(fdt_setprop_cell(fdt, bus_off, "ibm,pci-config-space-type", 0x1)); _FDT(fdt_setprop_cell(fdt, bus_off, "ibm,pe-total-#msi", - spapr_irq_nr_msis(spapr))); + SPAPR_IRQ_NR_MSIS)); =20 /* Dynamic DMA window */ if (phb->ddw_enabled) { diff --git a/include/hw/ppc/spapr_irq.h b/include/hw/ppc/spapr_irq.h index 5ddd1107c3..265d43e06b 100644 --- a/include/hw/ppc/spapr_irq.h +++ b/include/hw/ppc/spapr_irq.h @@ -40,6 +40,7 @@ #define SPAPR_IRQ_MSI (SPAPR_XIRQ_BASE + 0x0300) =20 #define SPAPR_NR_XIRQS 0x1000 +#define SPAPR_IRQ_NR_MSIS (SPAPR_XIRQ_BASE + SPAPR_NR_XIRQS - SPAPR_IRQ= _MSI) =20 struct SpaprMachineState; =20 @@ -89,7 +90,6 @@ void spapr_irq_print_info(struct SpaprMachineState *spapr= , GString *buf); void spapr_irq_dt(struct SpaprMachineState *spapr, uint32_t nr_servers, void *fdt, uint32_t phandle); =20 -uint32_t spapr_irq_nr_msis(struct SpaprMachineState *spapr); int spapr_irq_msi_alloc(struct SpaprMachineState *spapr, uint32_t num, boo= l align, Error **errp); void spapr_irq_msi_free(struct SpaprMachineState *spapr, int irq, uint32_t= num); --=20 2.51.0