motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-12-11 16:00:50 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

ipmi: add fwinfo to pci ipmi devices

Browse source 
This requires some adjustments to callers to avoid possible behaviour
changes for PCI devices.

Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Message-ID: <20250401140153.685523-3-npiggin@gmail.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
[Rename pci_ipmi_bt_get_fwinfo to pci_ipmi_kcs_get_fwinfo in the
 pci_ipmi_kcs.c file.]
Signed-off-by: Corey Minyard <corey@minyard.net>
This commit is contained in:
Nicholas Piggin 2025-04-02 00:01:49 +10:00 • committed by Corey Minyard
parent 3e0a763136
commit 7376d10b50
7 changed files with 38 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
hw/acpi/ipmi.c
View file

@ -55,7 +55,8 @@ static Aml *aml_ipmi_crs(IPMIFwInfo *info)
abort();
}
if (info->interrupt_number) {
/* Should PCI interrupts also be appended? */
if (info->irq_source == IPMI_ISA_IRQ && info->interrupt_number) {
aml_append(crs, aml_irq_no_flags(info->interrupt_number));
}

1
hw/ipmi/isa_ipmi_bt.c
View file

@ -49,6 +49,7 @@ static void isa_ipmi_bt_get_fwinfo(struct IPMIInterface *ii, IPMIFwInfo *info)
ISAIPMIBTDevice *iib = ISA_IPMI_BT(ii);
ipmi_bt_get_fwinfo(&iib->bt, info);
info->irq_source = IPMI_ISA_IRQ;
info->interrupt_number = iib->isairq;
info->i2c_slave_address = iib->bt.bmc->slave_addr;
info->uuid = iib->uuid;

1
hw/ipmi/isa_ipmi_kcs.c
View file

@ -49,6 +49,7 @@ static void isa_ipmi_kcs_get_fwinfo(IPMIInterface *ii, IPMIFwInfo *info)
ISAIPMIKCSDevice *iik = ISA_IPMI_KCS(ii);
ipmi_kcs_get_fwinfo(&iik->kcs, info);
info->irq_source = IPMI_ISA_IRQ;
info->interrupt_number = iik->isairq;
info->uuid = iik->uuid;
}

12
hw/ipmi/pci_ipmi_bt.c
View file

@ -38,6 +38,17 @@ struct PCIIPMIBTDevice {
uint32_t uuid;
};
static void pci_ipmi_bt_get_fwinfo(struct IPMIInterface *ii, IPMIFwInfo *info)
{
PCIIPMIBTDevice *pib = PCI_IPMI_BT(ii);
ipmi_bt_get_fwinfo(&pib->bt, info);
info->irq_source = IPMI_PCI_IRQ;
info->interrupt_number = pci_intx(&pib->dev);
info->i2c_slave_address = pib->bt.bmc->slave_addr;
info->uuid = pib->uuid;
}
static void pci_ipmi_raise_irq(IPMIBT *ib)
{
PCIIPMIBTDevice *pib = ib->opaque;
@ -125,6 +136,7 @@ static void pci_ipmi_bt_class_init(ObjectClass *oc, void *data)
iic->get_backend_data = pci_ipmi_bt_get_backend_data;
ipmi_bt_class_init(iic);
iic->get_fwinfo = pci_ipmi_bt_get_fwinfo;
}
static const TypeInfo pci_ipmi_bt_info = {

11
hw/ipmi/pci_ipmi_kcs.c
View file

@ -38,6 +38,16 @@ struct PCIIPMIKCSDevice {
uint32_t uuid;
};
static void pci_ipmi_kcs_get_fwinfo(struct IPMIInterface *ii, IPMIFwInfo *info)
{
PCIIPMIKCSDevice *pik = PCI_IPMI_KCS(ii);
ipmi_kcs_get_fwinfo(&pik->kcs, info);
info->irq_source = IPMI_PCI_IRQ;
info->interrupt_number = pci_intx(&pik->dev);
info->uuid = pik->uuid;
}
static void pci_ipmi_raise_irq(IPMIKCS *ik)
{
PCIIPMIKCSDevice *pik = ik->opaque;
@ -125,6 +135,7 @@ static void pci_ipmi_kcs_class_init(ObjectClass *oc, void *data)
iic->get_backend_data = pci_ipmi_kcs_get_backend_data;
ipmi_kcs_class_init(iic);
iic->get_fwinfo = pci_ipmi_kcs_get_fwinfo;
}
static const TypeInfo pci_ipmi_kcs_info = {

7
hw/smbios/smbios_type_38.c
View file

@ -72,7 +72,12 @@ static void smbios_build_one_type_38(IPMIFwInfo *info)
" SMBIOS, ignoring this entry.", info->register_spacing);
return;
}
t->interrupt_number = info->interrupt_number;
if (info->irq_source == IPMI_ISA_IRQ) {
t->interrupt_number = info->interrupt_number;
} else {
/* TODO: How to handle PCI? */
t->interrupt_number = 0;
}
SMBIOS_BUILD_TABLE_POST;
}

5
include/hw/ipmi/ipmi.h
View file

@ -90,6 +90,11 @@ typedef struct IPMIFwInfo {
} memspace;
int interrupt_number;
enum {
IPMI_NO_IRQ = 0,
IPMI_ISA_IRQ,
IPMI_PCI_IRQ,
} irq_source;
enum {
IPMI_LEVEL_IRQ,
IPMI_EDGE_IRQ