|
@@ -13,7 +13,7 @@
|
|
#include "hw/acpi/acpi.h"
|
|
#include "hw/acpi/acpi.h"
|
|
#include "hw/acpi/ipmi.h"
|
|
#include "hw/acpi/ipmi.h"
|
|
|
|
|
|
-static Aml *aml_ipmi_crs(IPMIFwInfo *info)
|
|
|
|
|
|
+static Aml *aml_ipmi_crs(IPMIFwInfo *info, const char *resource)
|
|
{
|
|
{
|
|
Aml *crs = aml_resource_template();
|
|
Aml *crs = aml_resource_template();
|
|
|
|
|
|
@@ -48,7 +48,8 @@ static Aml *aml_ipmi_crs(IPMIFwInfo *info)
|
|
info->register_spacing, info->register_length));
|
|
info->register_spacing, info->register_length));
|
|
break;
|
|
break;
|
|
case IPMI_MEMSPACE_SMBUS:
|
|
case IPMI_MEMSPACE_SMBUS:
|
|
- aml_append(crs, aml_return(aml_int(info->base_address)));
|
|
|
|
|
|
+ aml_append(crs, aml_i2c_serial_bus_device(info->base_address,
|
|
|
|
+ resource));
|
|
break;
|
|
break;
|
|
default:
|
|
default:
|
|
abort();
|
|
abort();
|
|
@@ -61,7 +62,7 @@ static Aml *aml_ipmi_crs(IPMIFwInfo *info)
|
|
return crs;
|
|
return crs;
|
|
}
|
|
}
|
|
|
|
|
|
-static Aml *aml_ipmi_device(IPMIFwInfo *info)
|
|
|
|
|
|
+static Aml *aml_ipmi_device(IPMIFwInfo *info, const char *resource)
|
|
{
|
|
{
|
|
Aml *dev;
|
|
Aml *dev;
|
|
uint16_t version = ((info->ipmi_spec_major_revision << 8)
|
|
uint16_t version = ((info->ipmi_spec_major_revision << 8)
|
|
@@ -74,14 +75,14 @@ static Aml *aml_ipmi_device(IPMIFwInfo *info)
|
|
aml_append(dev, aml_name_decl("_STR", aml_string("ipmi_%s",
|
|
aml_append(dev, aml_name_decl("_STR", aml_string("ipmi_%s",
|
|
info->interface_name)));
|
|
info->interface_name)));
|
|
aml_append(dev, aml_name_decl("_UID", aml_int(info->uuid)));
|
|
aml_append(dev, aml_name_decl("_UID", aml_int(info->uuid)));
|
|
- aml_append(dev, aml_name_decl("_CRS", aml_ipmi_crs(info)));
|
|
|
|
|
|
+ aml_append(dev, aml_name_decl("_CRS", aml_ipmi_crs(info, resource)));
|
|
aml_append(dev, aml_name_decl("_IFT", aml_int(info->interface_type)));
|
|
aml_append(dev, aml_name_decl("_IFT", aml_int(info->interface_type)));
|
|
aml_append(dev, aml_name_decl("_SRV", aml_int(version)));
|
|
aml_append(dev, aml_name_decl("_SRV", aml_int(version)));
|
|
|
|
|
|
return dev;
|
|
return dev;
|
|
}
|
|
}
|
|
|
|
|
|
-void build_acpi_ipmi_devices(Aml *scope, BusState *bus)
|
|
|
|
|
|
+void build_acpi_ipmi_devices(Aml *scope, BusState *bus, const char *resource)
|
|
{
|
|
{
|
|
|
|
|
|
BusChild *kid;
|
|
BusChild *kid;
|
|
@@ -101,6 +102,6 @@ void build_acpi_ipmi_devices(Aml *scope, BusState *bus)
|
|
iic = IPMI_INTERFACE_GET_CLASS(obj);
|
|
iic = IPMI_INTERFACE_GET_CLASS(obj);
|
|
memset(&info, 0, sizeof(info));
|
|
memset(&info, 0, sizeof(info));
|
|
iic->get_fwinfo(ii, &info);
|
|
iic->get_fwinfo(ii, &info);
|
|
- aml_append(scope, aml_ipmi_device(&info));
|
|
|
|
|
|
+ aml_append(scope, aml_ipmi_device(&info, resource));
|
|
}
|
|
}
|
|
}
|
|
}
|