talexander
/
freebsd_amp_hwpstate
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bhyve: save softc of ACPI devices 

This will be useful for writing device specific ACPI tables or DSDT
methods.

Reviewed by:		markj
MFC after:		1 week
Sponsored by:		Beckhoff Automation GmbH & Co. KG
Differential Revision:	https://reviews.freebsd.org/D39322
This commit is contained in:
Corvin Köhne 2022-07-22 10:15:28 +02:00
parent 2ef2c26f3f
commit 158adced65
No known key found for this signature in database
GPG Key ID: D854DA56315E026A
3 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
usr.sbin/bhyve/acpi_device.c
View File

@ -36,18 +36,20 @@ struct acpi_resource_list_entry {
* Holds information about an ACPI device.
*
* @param vm_ctx VM context the ACPI device was created in.
* @param softc A pointer to the software context of the ACPI device.
* @param emul Device emulation struct. It contains some information like the
name of the ACPI device and some device specific functions.
* @param crs Current resources used by the ACPI device.
*/
struct acpi_device {
struct vmctx *vm_ctx;
void *softc;
const struct acpi_device_emul *emul;
SLIST_HEAD(acpi_resource_list, acpi_resource_list_entry) crs;
};
int
acpi_device_create(struct acpi_device **const new_dev,
acpi_device_create(struct acpi_device **const new_dev, void *const softc,
struct vmctx *const vm_ctx, const struct acpi_device_emul *const emul)
{
assert(new_dev != NULL);
@ -60,6 +62,7 @@ acpi_device_create(struct acpi_device **const new_dev,
}
dev->vm_ctx = vm_ctx;
dev->softc = softc;
dev->emul = emul;
SLIST_INIT(&dev->crs);
@ -136,6 +139,14 @@ acpi_device_add_res_fixed_memory32(struct acpi_device *const dev,
return (0);
}
void *
acpi_device_get_softc(const struct acpi_device *const dev)
{
assert(dev != NULL);
return (dev->softc);
}
int
acpi_device_build_table(const struct acpi_device *const dev)
{

7
usr.sbin/bhyve/acpi_device.h
View File

@ -38,13 +38,14 @@ struct acpi_device_emul {
* Creates an ACPI device.
*
* @param[out] new_dev Returns the newly create ACPI device.
* @param[in] softc Pointer to the software context of the ACPI device.
* @param[in] vm_ctx VM context the ACPI device is created in.
* @param[in] emul Device emulation struct. It contains some information
* like the name of the ACPI device and some device specific
* functions.
*/
int acpi_device_create(struct acpi_device **new_dev, struct vmctx *vm_ctx,
const struct acpi_device_emul *emul);
int acpi_device_create(struct acpi_device **new_dev, void *softc,
struct vmctx *vm_ctx, const struct acpi_device_emul *emul);
void acpi_device_destroy(struct acpi_device *dev);
int acpi_device_add_res_fixed_ioport(struct acpi_device *dev, UINT16 port,
@ -52,5 +53,7 @@ int acpi_device_add_res_fixed_ioport(struct acpi_device *dev, UINT16 port,
int acpi_device_add_res_fixed_memory32(struct acpi_device *dev,
UINT8 write_protected, UINT32 address, UINT32 length);
void *acpi_device_get_softc(const struct acpi_device *dev);
int acpi_device_build_table(const struct acpi_device *dev);
int acpi_device_write_dsdt(const struct acpi_device *dev);

2
usr.sbin/bhyve/qemu_fwcfg.c
View File

@ -401,7 +401,7 @@ qemu_fwcfg_init(struct vmctx *const ctx)
* tables and register io ports for fwcfg, if it's used.
*/
if (strcmp(lpc_fwcfg(), "qemu") == 0) {
error = acpi_device_create(&fwcfg_sc.acpi_dev, ctx,
error = acpi_device_create(&fwcfg_sc.acpi_dev, &fwcfg_sc, ctx,
&qemu_fwcfg_acpi_device_emul);
if (error) {
warnx("%s: failed to create ACPI device for QEMU FwCfg",