From nobody Sun Nov 16 02:30:09 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 ARC-Seal: i=1; a=rsa-sha256; t=1744848206; cv=none; d=zohomail.com; s=zohoarc; b=WakBLAAhchm6ErVwB4JsRNE4xBaK0yOPFcW9xxJ9w2v2t+86Ag1xe4Hp1kzoITGhXkgVkipEzjGrxXZ2rP3WEo3YONOOcgLrmmvSZebWY5RbAzBH64leJ3RR6oVDM/totXs2hIdEifDe08u8XdZE7t/zY5WQzQgFNWD4NQczYi0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1744848206; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=WIdhZ2B/3rXlZaDDyS0TejvZV6gKym2suKu1qn0P8JA=; b=YStTB+lNjFMgGPA+rUzkuXRfxRHhlr3+fGS8KrNoHFcx4CyvmrVJ+EjdTwmVfb+hnlXtH6h/D4z8cjiAMBiMsAtMx0l5eoIRjm5B+z6EM0dIHI+dCwy2/D0JY0YZPtsezuAI54KxmEN4YPkG1gKD46oTrWDKjl98KpCbEGPHV3w= 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1744848206597940.0025986044478; Wed, 16 Apr 2025 17:03:26 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u5CiI-00042P-QB; Wed, 16 Apr 2025 20:02:42 -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 1u5CiH-00041j-Hz for qemu-devel@nongnu.org; Wed, 16 Apr 2025 20:02:41 -0400 Received: from mail-oa1-x36.google.com ([2001:4860:4864:20::36]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u5CiF-0006PT-6I for qemu-devel@nongnu.org; Wed, 16 Apr 2025 20:02:41 -0400 Received: by mail-oa1-x36.google.com with SMTP id 586e51a60fabf-2c873231e7bso87434fac.3 for ; Wed, 16 Apr 2025 17:02:38 -0700 (PDT) Received: from localhost ([2001:470:b8f6:1b:8795:e9fb:beca:ef25]) by smtp.gmail.com with UTF8SMTPSA id 586e51a60fabf-2d0969589c5sm3561396fac.17.2025.04.16.17.02.34 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 16 Apr 2025 17:02:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=minyard-net.20230601.gappssmtp.com; s=20230601; t=1744848157; x=1745452957; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=WIdhZ2B/3rXlZaDDyS0TejvZV6gKym2suKu1qn0P8JA=; b=DO8BhJqznondnC4X6ZJ5FiU5Yc5XakvIl4JFoN944Ke7wMyY3kEVA8XJQzSr5CJbuT 8lY06wUa9JnQ3ELANJUZ+SqYNMgS50rFAq1FDHI/L1c4B5pTcm3x1qUBLdXVAm7cAPoH P+/DJZXSQULudzEiyDwkay7TYY2z+p4nQpwnDZh8zhrkktrSpq7tg/g0GsZahWVuGeMA TCq/s1xmw4GppXROBlC0Bmbkpft9p9DqQN0zgSEXehbvv4KdMv8im1IO3/8MSUYq7EBL 9gGkMCad+9W4vgVRk4p9RtPq4EV9hXNChF4efP40P67bkpQ2zT5X34S9GD+HrzP6cjjd c32w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744848157; x=1745452957; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=WIdhZ2B/3rXlZaDDyS0TejvZV6gKym2suKu1qn0P8JA=; b=j51bjMK/HgciUAqzB+5PK8UNzFWgVBo/oo+2ICzGPRusZhV+D7gRsIfgvHDMFXhV16 ySEBh3U/3rL+wpWIv803i5NmQ+Q9/nwdExFEgvSbrgAzg6S30lQB5fsMf1GdqGthio7z /gxsIB87p/rZp9OaMFJnWJp9KIUuyDimjRorUspm3MXCzoECL7p0HxgJHyWXL7hV6ZhX bsE5R5MM+aXGAhyAYj/VcbpGtcP8urnqnntBj/sx9DQamnKrbSThwqwXSfv6V28JZ5kf SyStR4Leh8CHhJFylXQM7V6QT07ZYIpQvLLnqr+55Le/YUUCFDuJql1UF481qoW9I/dv JmZg== X-Gm-Message-State: AOJu0YxET8V+2lMXWEz1yh+omXFKlEc3v0j8GKs1CzjytHcsmp7a/60H v4L53x4/7k2uCux4WbY97VLCSfMfSfXzxIbgXtIC1NKvK2HyIJ61sb8pxUs9a0Tv1TAgbu325GA g X-Gm-Gg: ASbGnct6j5SoPsiU3elBJ5qE5/MHdK2A7vdO6FkcAXHtuB/vk95y0r+Fa3Ohf4B48d6 BL70C2Zn8YeOKtF/XE7KO1V1iCPzIS3WbAxBGETz/C2V3JCKFNGamVURrZm7s5FCxIWbePQ8k6u WP8sVE/mOjfEJL6osqSN0734eFeId+OILsahi6AOKwBhNoCHri6lGQzKZvJkHyP0AuOZW6U1ONZ q9NWMJXOnEyzkOsl2LECuLm7IUWjnlG0RH7QJwdBWQSs4xcRCaKZi6EnJgM21I6EEThKN1Lhbvf 3VPnVlPx1nU5wqbnChKZLoXzIhIt5Yv4J+U= X-Google-Smtp-Source: AGHT+IG2cMd/BU3tAfNVeKS09RJKPMhdcxjeyIM847yQJD8CKw7fokY9PKdtm4U5oGGF+LcHezpckg== X-Received: by 2002:a05:6870:a691:b0:296:e491:b244 with SMTP id 586e51a60fabf-2d4d2d4cf78mr2309004fac.32.1744848156715; Wed, 16 Apr 2025 17:02:36 -0700 (PDT) From: Corey Minyard To: qemu-devel@nongnu.org Cc: Nicholas Piggin , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Corey Minyard Subject: [PULL 3/6] ipmi: add fwinfo to pci ipmi devices Date: Wed, 16 Apr 2025 18:59:07 -0500 Message-ID: <20250417000224.3830705-4-corey@minyard.net> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250417000224.3830705-1-corey@minyard.net> References: <20250417000224.3830705-1-corey@minyard.net> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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: none client-ip=2001:4860:4864:20::36; envelope-from=corey@minyard.net; helo=mail-oa1-x36.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=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 @minyard-net.20230601.gappssmtp.com) X-ZM-MESSAGEID: 1744848210798019100 From: Nicholas Piggin This requires some adjustments to callers to avoid possible behaviour changes for PCI devices. Signed-off-by: Nicholas Piggin Message-ID: <20250401140153.685523-3-npiggin@gmail.com> Reviewed-by: Philippe Mathieu-Daud=C3=A9 [Rename pci_ipmi_bt_get_fwinfo to pci_ipmi_kcs_get_fwinfo in the pci_ipmi_kcs.c file.] Signed-off-by: Corey Minyard --- hw/acpi/ipmi.c | 3 ++- hw/ipmi/isa_ipmi_bt.c | 1 + hw/ipmi/isa_ipmi_kcs.c | 1 + hw/ipmi/pci_ipmi_bt.c | 12 ++++++++++++ hw/ipmi/pci_ipmi_kcs.c | 11 +++++++++++ hw/smbios/smbios_type_38.c | 7 ++++++- include/hw/ipmi/ipmi.h | 5 +++++ 7 files changed, 38 insertions(+), 2 deletions(-) diff --git a/hw/acpi/ipmi.c b/hw/acpi/ipmi.c index a20e57d465..39f8f2f6d6 100644 --- a/hw/acpi/ipmi.c +++ b/hw/acpi/ipmi.c @@ -55,7 +55,8 @@ static Aml *aml_ipmi_crs(IPMIFwInfo *info) abort(); } =20 - if (info->interrupt_number) { + /* Should PCI interrupts also be appended? */ + if (info->irq_source =3D=3D IPMI_ISA_IRQ && info->interrupt_number) { aml_append(crs, aml_irq_no_flags(info->interrupt_number)); } =20 diff --git a/hw/ipmi/isa_ipmi_bt.c b/hw/ipmi/isa_ipmi_bt.c index 474a792c9a..76585e786e 100644 --- a/hw/ipmi/isa_ipmi_bt.c +++ b/hw/ipmi/isa_ipmi_bt.c @@ -49,6 +49,7 @@ static void isa_ipmi_bt_get_fwinfo(struct IPMIInterface *= ii, IPMIFwInfo *info) ISAIPMIBTDevice *iib =3D ISA_IPMI_BT(ii); =20 ipmi_bt_get_fwinfo(&iib->bt, info); + info->irq_source =3D IPMI_ISA_IRQ; info->interrupt_number =3D iib->isairq; info->i2c_slave_address =3D iib->bt.bmc->slave_addr; info->uuid =3D iib->uuid; diff --git a/hw/ipmi/isa_ipmi_kcs.c b/hw/ipmi/isa_ipmi_kcs.c index 94bbe45d35..ba3ae208b2 100644 --- a/hw/ipmi/isa_ipmi_kcs.c +++ b/hw/ipmi/isa_ipmi_kcs.c @@ -49,6 +49,7 @@ static void isa_ipmi_kcs_get_fwinfo(IPMIInterface *ii, IP= MIFwInfo *info) ISAIPMIKCSDevice *iik =3D ISA_IPMI_KCS(ii); =20 ipmi_kcs_get_fwinfo(&iik->kcs, info); + info->irq_source =3D IPMI_ISA_IRQ; info->interrupt_number =3D iik->isairq; info->uuid =3D iik->uuid; } diff --git a/hw/ipmi/pci_ipmi_bt.c b/hw/ipmi/pci_ipmi_bt.c index a3b742d22c..7ba8b3ab96 100644 --- a/hw/ipmi/pci_ipmi_bt.c +++ b/hw/ipmi/pci_ipmi_bt.c @@ -38,6 +38,17 @@ struct PCIIPMIBTDevice { uint32_t uuid; }; =20 +static void pci_ipmi_bt_get_fwinfo(struct IPMIInterface *ii, IPMIFwInfo *i= nfo) +{ + PCIIPMIBTDevice *pib =3D PCI_IPMI_BT(ii); + + ipmi_bt_get_fwinfo(&pib->bt, info); + info->irq_source =3D IPMI_PCI_IRQ; + info->interrupt_number =3D pci_intx(&pib->dev); + info->i2c_slave_address =3D pib->bt.bmc->slave_addr; + info->uuid =3D pib->uuid; +} + static void pci_ipmi_raise_irq(IPMIBT *ib) { PCIIPMIBTDevice *pib =3D ib->opaque; @@ -125,6 +136,7 @@ static void pci_ipmi_bt_class_init(ObjectClass *oc, voi= d *data) =20 iic->get_backend_data =3D pci_ipmi_bt_get_backend_data; ipmi_bt_class_init(iic); + iic->get_fwinfo =3D pci_ipmi_bt_get_fwinfo; } =20 static const TypeInfo pci_ipmi_bt_info =3D { diff --git a/hw/ipmi/pci_ipmi_kcs.c b/hw/ipmi/pci_ipmi_kcs.c index 05ba97ec58..0aa35143e9 100644 --- a/hw/ipmi/pci_ipmi_kcs.c +++ b/hw/ipmi/pci_ipmi_kcs.c @@ -38,6 +38,16 @@ struct PCIIPMIKCSDevice { uint32_t uuid; }; =20 +static void pci_ipmi_kcs_get_fwinfo(struct IPMIInterface *ii, IPMIFwInfo *= info) +{ + PCIIPMIKCSDevice *pik =3D PCI_IPMI_KCS(ii); + + ipmi_kcs_get_fwinfo(&pik->kcs, info); + info->irq_source =3D IPMI_PCI_IRQ; + info->interrupt_number =3D pci_intx(&pik->dev); + info->uuid =3D pik->uuid; +} + static void pci_ipmi_raise_irq(IPMIKCS *ik) { PCIIPMIKCSDevice *pik =3D ik->opaque; @@ -125,6 +135,7 @@ static void pci_ipmi_kcs_class_init(ObjectClass *oc, vo= id *data) =20 iic->get_backend_data =3D pci_ipmi_kcs_get_backend_data; ipmi_kcs_class_init(iic); + iic->get_fwinfo =3D pci_ipmi_kcs_get_fwinfo; } =20 static const TypeInfo pci_ipmi_kcs_info =3D { diff --git a/hw/smbios/smbios_type_38.c b/hw/smbios/smbios_type_38.c index 168b886647..e9b856fcd9 100644 --- a/hw/smbios/smbios_type_38.c +++ b/hw/smbios/smbios_type_38.c @@ -72,7 +72,12 @@ static void smbios_build_one_type_38(IPMIFwInfo *info) " SMBIOS, ignoring this entry.", info->register_spaci= ng); return; } - t->interrupt_number =3D info->interrupt_number; + if (info->irq_source =3D=3D IPMI_ISA_IRQ) { + t->interrupt_number =3D info->interrupt_number; + } else { + /* TODO: How to handle PCI? */ + t->interrupt_number =3D 0; + } =20 SMBIOS_BUILD_TABLE_POST; } diff --git a/include/hw/ipmi/ipmi.h b/include/hw/ipmi/ipmi.h index 77a7213ed9..c8ef04856e 100644 --- a/include/hw/ipmi/ipmi.h +++ b/include/hw/ipmi/ipmi.h @@ -90,6 +90,11 @@ typedef struct IPMIFwInfo { } memspace; =20 int interrupt_number; + enum { + IPMI_NO_IRQ =3D 0, + IPMI_ISA_IRQ, + IPMI_PCI_IRQ, + } irq_source; enum { IPMI_LEVEL_IRQ, IPMI_EDGE_IRQ --=20 2.43.0