mirror of https://github.com/xemu-project/xemu.git
fw_cfg: add dma interface, add strings via cmdline.
-----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) iQIcBAABAgAGBQJWJdomAAoJEEy22O7T6HE4wPoQALST6AWh/3Ki1SVwMyP5KUru bqfII25LDhRNgoyeCA4/LrKhJJC296uO7+/eUOByHIEEb8mWjfHucPCd7ZTsYwHI 9zQCL6MgnVzjiM5bDBP//1b69mLDQgDCV15QNZHiuYbKhhy/nv8MGqvb9RrpKf9U gDy9aYEFugicWxb5t1rZjxRKCsJkOxOZXEw+CuIEDL1jxQNOsFaMNIkvuoCSRSxK 783Lr9oZDpbPcTOl3dlu6iOJsXkDxgLuntEH/TcczmgZWxnNTPRjcgMXjznGYUed JPIbUb/AkUrN9dJNF6zaA99N8S6f57WVLalaViT7oBX1p1OcbK36nS2Jt54D9Tqy LTeu2D/jcp5bGciA2uVKVgHTm2IvN5Igl3mndK4RRIXJ6kJ3nrFRz8mahlkVNHFP YsmOapccsuSbS3u6rcjtLsSAQXJbLWPve579Eo/i6mbyYEzqF12eET2vMbYHOEil 8s4BtdWnQKpCRQSc0i8MyEy4Uylrx9UhXMhnWSsbJvyI/PkOxD9Zfo1RB8ClTsKS WV3vhhOJkEciN4ebMs60Vgm8cDYkgMG/Tt6boczl4ATihUtsD4EX4db9ZebwVCJT 9Or+mBDSZzYFkWZPmIZmh5bXbjyYIe6azTJjIvjz4UTmPuZONPl5WgwDbazH+v0Q Lsb4wkHwXsg7bwihlJdL =deAj -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/kraxel/tags/pull-fw_cfg-20151020-1' into staging fw_cfg: add dma interface, add strings via cmdline. # gpg: Signature made Tue 20 Oct 2015 07:07:34 BST using RSA key ID D3E87138 # gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" # gpg: aka "Gerd Hoffmann <gerd@kraxel.org>" # gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>" * remotes/kraxel/tags/pull-fw_cfg-20151020-1: fw_cfg: Define a static signature to be returned on DMA port reads Enable fw_cfg DMA interface for x86 Enable fw_cfg DMA interface for ARM Implement fw_cfg DMA interface fw_cfg DMA interface documentation fw_cfg: document fw_cfg_modify_iXX() update functions fw_cfg: insert string blobs via qemu cmdline Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell
commit
df81978368
|
|
@ -76,6 +76,13 @@ increasing address order, similar to memcpy().
|
|||
|
||||
Selector Register IOport: 0x510
|
||||
Data Register IOport: 0x511
|
||||
DMA Address IOport: 0x514
|
||||
|
||||
=== ARM Register Locations ===
|
||||
|
||||
Selector Register address: Base + 8 (2 bytes)
|
||||
Data Register address: Base + 0 (8 bytes)
|
||||
DMA Address address: Base + 16 (8 bytes)
|
||||
|
||||
== Firmware Configuration Items ==
|
||||
|
||||
|
|
@ -86,11 +93,15 @@ by selecting the "signature" item using key 0x0000 (FW_CFG_SIGNATURE),
|
|||
and reading four bytes from the data register. If the fw_cfg device is
|
||||
present, the four bytes read will contain the characters "QEMU".
|
||||
|
||||
=== Revision (Key 0x0001, FW_CFG_ID) ===
|
||||
If the DMA interface is available, then reading the DMA Address
|
||||
Register returns 0x51454d5520434647 ("QEMU CFG" in big-endian format).
|
||||
|
||||
A 32-bit little-endian unsigned int, this item is used as an interface
|
||||
revision number, and is currently set to 1 by QEMU when fw_cfg is
|
||||
initialized.
|
||||
=== Revision / feature bitmap (Key 0x0001, FW_CFG_ID) ===
|
||||
|
||||
A 32-bit little-endian unsigned int, this item is used to check for enabled
|
||||
features.
|
||||
- Bit 0: traditional interface. Always set.
|
||||
- Bit 1: DMA interface.
|
||||
|
||||
=== File Directory (Key 0x0019, FW_CFG_FILE_DIR) ===
|
||||
|
||||
|
|
@ -132,6 +143,55 @@ Selector Reg. Range Usage
|
|||
In practice, the number of allowed firmware configuration items is given
|
||||
by the value of FW_CFG_MAX_ENTRY (see fw_cfg.h).
|
||||
|
||||
= Guest-side DMA Interface =
|
||||
|
||||
If bit 1 of the feature bitmap is set, the DMA interface is present. This does
|
||||
not replace the existing fw_cfg interface, it is an add-on. This interface
|
||||
can be used through the 64-bit wide address register.
|
||||
|
||||
The address register is in big-endian format. The value for the register is 0
|
||||
at startup and after an operation. A write to the least significant half (at
|
||||
offset 4) triggers an operation. This means that operations with 32-bit
|
||||
addresses can be triggered with just one write, whereas operations with
|
||||
64-bit addresses can be triggered with one 64-bit write or two 32-bit writes,
|
||||
starting with the most significant half (at offset 0).
|
||||
|
||||
In this register, the physical address of a FWCfgDmaAccess structure in RAM
|
||||
should be written. This is the format of the FWCfgDmaAccess structure:
|
||||
|
||||
typedef struct FWCfgDmaAccess {
|
||||
uint32_t control;
|
||||
uint32_t length;
|
||||
uint64_t address;
|
||||
} FWCfgDmaAccess;
|
||||
|
||||
The fields of the structure are in big endian mode, and the field at the lowest
|
||||
address is the "control" field.
|
||||
|
||||
The "control" field has the following bits:
|
||||
- Bit 0: Error
|
||||
- Bit 1: Read
|
||||
- Bit 2: Skip
|
||||
- Bit 3: Select. The upper 16 bits are the selected index.
|
||||
|
||||
When an operation is triggered, if the "control" field has bit 3 set, the
|
||||
upper 16 bits are interpreted as an index of a firmware configuration item.
|
||||
This has the same effect as writing the selector register.
|
||||
|
||||
If the "control" field has bit 1 set, a read operation will be performed.
|
||||
"length" bytes for the current selector and offset will be copied into the
|
||||
physical RAM address specified by the "address" field.
|
||||
|
||||
If the "control" field has bit 2 set (and not bit 1), a skip operation will be
|
||||
performed. The offset for the current selector will be advanced "length" bytes.
|
||||
|
||||
To check the result, read the "control" field:
|
||||
error bit set -> something went wrong.
|
||||
all bits cleared -> transfer finished successfully.
|
||||
otherwise -> transfer still in progress (doesn't happen
|
||||
today due to implementation not being async,
|
||||
but may in the future).
|
||||
|
||||
= Host-side API =
|
||||
|
||||
The following functions are available to the QEMU programmer for adding
|
||||
|
|
@ -159,6 +219,17 @@ will convert a 16-, 32-, or 64-bit integer to little-endian, then add
|
|||
a dynamically allocated copy of the appropriately sized item to fw_cfg
|
||||
under the given selector key value.
|
||||
|
||||
== fw_cfg_modify_iXX() ==
|
||||
|
||||
Modify the value of an XX-bit item (where XX may be 16, 32, or 64).
|
||||
Similarly to the corresponding fw_cfg_add_iXX() function set, convert
|
||||
a 16-, 32-, or 64-bit integer to little endian, create a dynamically
|
||||
allocated copy of the required size, and replace the existing item at
|
||||
the given selector key value with the newly allocated one. The previous
|
||||
item, assumed to have been allocated during an earlier call to
|
||||
fw_cfg_add_iXX() or fw_cfg_modify_iXX() (of the same width XX), is freed
|
||||
before the function returns.
|
||||
|
||||
== fw_cfg_add_file() ==
|
||||
|
||||
Given a filename (i.e., fw_cfg item name), starting pointer, and size,
|
||||
|
|
@ -216,6 +287,21 @@ the following syntax:
|
|||
where <item_name> is the fw_cfg item name, and <path> is the location
|
||||
on the host file system of a file containing the data to be inserted.
|
||||
|
||||
Small enough items may be provided directly as strings on the command
|
||||
line, using the syntax:
|
||||
|
||||
-fw_cfg [name=]<item_name>,string=<string>
|
||||
|
||||
The terminating NUL character of the content <string> will NOT be
|
||||
included as part of the fw_cfg item data, which is consistent with
|
||||
the absence of a NUL terminator for items inserted via the file option.
|
||||
|
||||
Both <item_name> and, if applicable, the content <string> are passed
|
||||
through by QEMU without any interpretation, expansion, or further
|
||||
processing. Any such processing (potentially performed e.g., by the shell)
|
||||
is outside of QEMU's responsibility; as such, using plain ASCII characters
|
||||
is recommended.
|
||||
|
||||
NOTE: Users *SHOULD* choose item names beginning with the prefix "opt/"
|
||||
when using the "-fw_cfg" command line option, to avoid conflicting with
|
||||
item names used internally by QEMU. For instance:
|
||||
|
|
|
|||
|
|
@ -119,7 +119,7 @@ static const MemMapEntry a15memmap[] = {
|
|||
[VIRT_GIC_REDIST] = { 0x080A0000, 0x00F60000 },
|
||||
[VIRT_UART] = { 0x09000000, 0x00001000 },
|
||||
[VIRT_RTC] = { 0x09010000, 0x00001000 },
|
||||
[VIRT_FW_CFG] = { 0x09020000, 0x0000000a },
|
||||
[VIRT_FW_CFG] = { 0x09020000, 0x00000018 },
|
||||
[VIRT_MMIO] = { 0x0a000000, 0x00000200 },
|
||||
/* ...repeating for a total of NUM_VIRTIO_TRANSPORTS, each of that size */
|
||||
[VIRT_PLATFORM_BUS] = { 0x0c000000, 0x02000000 },
|
||||
|
|
@ -677,13 +677,13 @@ static void create_flash(const VirtBoardInfo *vbi)
|
|||
g_free(nodename);
|
||||
}
|
||||
|
||||
static void create_fw_cfg(const VirtBoardInfo *vbi)
|
||||
static void create_fw_cfg(const VirtBoardInfo *vbi, AddressSpace *as)
|
||||
{
|
||||
hwaddr base = vbi->memmap[VIRT_FW_CFG].base;
|
||||
hwaddr size = vbi->memmap[VIRT_FW_CFG].size;
|
||||
char *nodename;
|
||||
|
||||
fw_cfg_init_mem_wide(base + 8, base, 8);
|
||||
fw_cfg_init_mem_wide(base + 8, base, 8, base + 16, as);
|
||||
|
||||
nodename = g_strdup_printf("/fw-cfg@%" PRIx64, base);
|
||||
qemu_fdt_add_subnode(vbi->fdt, nodename);
|
||||
|
|
@ -1031,7 +1031,7 @@ static void machvirt_init(MachineState *machine)
|
|||
*/
|
||||
create_virtio_devices(vbi, pic);
|
||||
|
||||
create_fw_cfg(vbi);
|
||||
create_fw_cfg(vbi, &address_space_memory);
|
||||
rom_set_fw(fw_cfg_find());
|
||||
|
||||
guest_info->smp_cpus = smp_cpus;
|
||||
|
|
|
|||
|
|
@ -752,14 +752,15 @@ static void pc_build_smbios(FWCfgState *fw_cfg)
|
|||
}
|
||||
}
|
||||
|
||||
static FWCfgState *bochs_bios_init(void)
|
||||
static FWCfgState *bochs_bios_init(AddressSpace *as)
|
||||
{
|
||||
FWCfgState *fw_cfg;
|
||||
uint64_t *numa_fw_cfg;
|
||||
int i, j;
|
||||
unsigned int apic_id_limit = pc_apic_id_limit(max_cpus);
|
||||
|
||||
fw_cfg = fw_cfg_init_io(BIOS_CFG_IOPORT);
|
||||
fw_cfg = fw_cfg_init_io_dma(BIOS_CFG_IOPORT, BIOS_CFG_IOPORT + 4, as);
|
||||
|
||||
/* FW_CFG_MAX_CPUS is a bit confusing/problematic on x86:
|
||||
*
|
||||
* SeaBIOS needs FW_CFG_MAX_CPUS for CPU hotplug, but the CPU hotplug
|
||||
|
|
@ -1393,7 +1394,8 @@ FWCfgState *pc_memory_init(PCMachineState *pcms,
|
|||
option_rom_mr,
|
||||
1);
|
||||
|
||||
fw_cfg = bochs_bios_init();
|
||||
fw_cfg = bochs_bios_init(&address_space_memory);
|
||||
|
||||
rom_set_fw(fw_cfg);
|
||||
|
||||
if (guest_info->has_reserved_memory && pcms->hotplug_memory.base) {
|
||||
|
|
|
|||
|
|
@ -23,6 +23,7 @@
|
|||
*/
|
||||
#include "hw/hw.h"
|
||||
#include "sysemu/sysemu.h"
|
||||
#include "sysemu/dma.h"
|
||||
#include "hw/isa/isa.h"
|
||||
#include "hw/nvram/fw_cfg.h"
|
||||
#include "hw/sysbus.h"
|
||||
|
|
@ -30,7 +31,7 @@
|
|||
#include "qemu/error-report.h"
|
||||
#include "qemu/config-file.h"
|
||||
|
||||
#define FW_CFG_SIZE 2
|
||||
#define FW_CFG_CTL_SIZE 2
|
||||
#define FW_CFG_NAME "fw_cfg"
|
||||
#define FW_CFG_PATH "/machine/" FW_CFG_NAME
|
||||
|
||||
|
|
@ -42,6 +43,18 @@
|
|||
#define FW_CFG_IO(obj) OBJECT_CHECK(FWCfgIoState, (obj), TYPE_FW_CFG_IO)
|
||||
#define FW_CFG_MEM(obj) OBJECT_CHECK(FWCfgMemState, (obj), TYPE_FW_CFG_MEM)
|
||||
|
||||
/* FW_CFG_VERSION bits */
|
||||
#define FW_CFG_VERSION 0x01
|
||||
#define FW_CFG_VERSION_DMA 0x02
|
||||
|
||||
/* FW_CFG_DMA_CONTROL bits */
|
||||
#define FW_CFG_DMA_CTL_ERROR 0x01
|
||||
#define FW_CFG_DMA_CTL_READ 0x02
|
||||
#define FW_CFG_DMA_CTL_SKIP 0x04
|
||||
#define FW_CFG_DMA_CTL_SELECT 0x08
|
||||
|
||||
#define FW_CFG_DMA_SIGNATURE 0x51454d5520434647ULL /* "QEMU CFG" */
|
||||
|
||||
typedef struct FWCfgEntry {
|
||||
uint32_t len;
|
||||
uint8_t *data;
|
||||
|
|
@ -59,6 +72,11 @@ struct FWCfgState {
|
|||
uint16_t cur_entry;
|
||||
uint32_t cur_offset;
|
||||
Notifier machine_ready;
|
||||
|
||||
bool dma_enabled;
|
||||
dma_addr_t dma_addr;
|
||||
AddressSpace *dma_as;
|
||||
MemoryRegion dma_iomem;
|
||||
};
|
||||
|
||||
struct FWCfgIoState {
|
||||
|
|
@ -67,7 +85,7 @@ struct FWCfgIoState {
|
|||
/*< public >*/
|
||||
|
||||
MemoryRegion comb_iomem;
|
||||
uint32_t iobase;
|
||||
uint32_t iobase, dma_iobase;
|
||||
};
|
||||
|
||||
struct FWCfgMemState {
|
||||
|
|
@ -292,6 +310,129 @@ static void fw_cfg_data_mem_write(void *opaque, hwaddr addr,
|
|||
} while (i);
|
||||
}
|
||||
|
||||
static void fw_cfg_dma_transfer(FWCfgState *s)
|
||||
{
|
||||
dma_addr_t len;
|
||||
FWCfgDmaAccess dma;
|
||||
int arch;
|
||||
FWCfgEntry *e;
|
||||
int read;
|
||||
dma_addr_t dma_addr;
|
||||
|
||||
/* Reset the address before the next access */
|
||||
dma_addr = s->dma_addr;
|
||||
s->dma_addr = 0;
|
||||
|
||||
if (dma_memory_read(s->dma_as, dma_addr, &dma, sizeof(dma))) {
|
||||
stl_be_dma(s->dma_as, dma_addr + offsetof(FWCfgDmaAccess, control),
|
||||
FW_CFG_DMA_CTL_ERROR);
|
||||
return;
|
||||
}
|
||||
|
||||
dma.address = be64_to_cpu(dma.address);
|
||||
dma.length = be32_to_cpu(dma.length);
|
||||
dma.control = be32_to_cpu(dma.control);
|
||||
|
||||
if (dma.control & FW_CFG_DMA_CTL_SELECT) {
|
||||
fw_cfg_select(s, dma.control >> 16);
|
||||
}
|
||||
|
||||
arch = !!(s->cur_entry & FW_CFG_ARCH_LOCAL);
|
||||
e = &s->entries[arch][s->cur_entry & FW_CFG_ENTRY_MASK];
|
||||
|
||||
if (dma.control & FW_CFG_DMA_CTL_READ) {
|
||||
read = 1;
|
||||
} else if (dma.control & FW_CFG_DMA_CTL_SKIP) {
|
||||
read = 0;
|
||||
} else {
|
||||
dma.length = 0;
|
||||
}
|
||||
|
||||
dma.control = 0;
|
||||
|
||||
while (dma.length > 0 && !(dma.control & FW_CFG_DMA_CTL_ERROR)) {
|
||||
if (s->cur_entry == FW_CFG_INVALID || !e->data ||
|
||||
s->cur_offset >= e->len) {
|
||||
len = dma.length;
|
||||
|
||||
/* If the access is not a read access, it will be a skip access,
|
||||
* tested before.
|
||||
*/
|
||||
if (read) {
|
||||
if (dma_memory_set(s->dma_as, dma.address, 0, len)) {
|
||||
dma.control |= FW_CFG_DMA_CTL_ERROR;
|
||||
}
|
||||
}
|
||||
|
||||
} else {
|
||||
if (dma.length <= (e->len - s->cur_offset)) {
|
||||
len = dma.length;
|
||||
} else {
|
||||
len = (e->len - s->cur_offset);
|
||||
}
|
||||
|
||||
if (e->read_callback) {
|
||||
e->read_callback(e->callback_opaque, s->cur_offset);
|
||||
}
|
||||
|
||||
/* If the access is not a read access, it will be a skip access,
|
||||
* tested before.
|
||||
*/
|
||||
if (read) {
|
||||
if (dma_memory_write(s->dma_as, dma.address,
|
||||
&e->data[s->cur_offset], len)) {
|
||||
dma.control |= FW_CFG_DMA_CTL_ERROR;
|
||||
}
|
||||
}
|
||||
|
||||
s->cur_offset += len;
|
||||
}
|
||||
|
||||
dma.address += len;
|
||||
dma.length -= len;
|
||||
|
||||
}
|
||||
|
||||
stl_be_dma(s->dma_as, dma_addr + offsetof(FWCfgDmaAccess, control),
|
||||
dma.control);
|
||||
|
||||
trace_fw_cfg_read(s, 0);
|
||||
}
|
||||
|
||||
static uint64_t fw_cfg_dma_mem_read(void *opaque, hwaddr addr,
|
||||
unsigned size)
|
||||
{
|
||||
/* Return a signature value (and handle various read sizes) */
|
||||
return extract64(FW_CFG_DMA_SIGNATURE, (8 - addr - size) * 8, size * 8);
|
||||
}
|
||||
|
||||
static void fw_cfg_dma_mem_write(void *opaque, hwaddr addr,
|
||||
uint64_t value, unsigned size)
|
||||
{
|
||||
FWCfgState *s = opaque;
|
||||
|
||||
if (size == 4) {
|
||||
if (addr == 0) {
|
||||
/* FWCfgDmaAccess high address */
|
||||
s->dma_addr = value << 32;
|
||||
} else if (addr == 4) {
|
||||
/* FWCfgDmaAccess low address */
|
||||
s->dma_addr |= value;
|
||||
fw_cfg_dma_transfer(s);
|
||||
}
|
||||
} else if (size == 8 && addr == 0) {
|
||||
s->dma_addr = value;
|
||||
fw_cfg_dma_transfer(s);
|
||||
}
|
||||
}
|
||||
|
||||
static bool fw_cfg_dma_mem_valid(void *opaque, hwaddr addr,
|
||||
unsigned size, bool is_write)
|
||||
{
|
||||
return !is_write || ((size == 4 && (addr == 0 || addr == 4)) ||
|
||||
(size == 8 && addr == 0));
|
||||
}
|
||||
|
||||
static bool fw_cfg_data_mem_valid(void *opaque, hwaddr addr,
|
||||
unsigned size, bool is_write)
|
||||
{
|
||||
|
|
@ -359,6 +500,15 @@ static const MemoryRegionOps fw_cfg_comb_mem_ops = {
|
|||
.valid.accepts = fw_cfg_comb_valid,
|
||||
};
|
||||
|
||||
static const MemoryRegionOps fw_cfg_dma_mem_ops = {
|
||||
.read = fw_cfg_dma_mem_read,
|
||||
.write = fw_cfg_dma_mem_write,
|
||||
.endianness = DEVICE_BIG_ENDIAN,
|
||||
.valid.accepts = fw_cfg_dma_mem_valid,
|
||||
.valid.max_access_size = 8,
|
||||
.impl.max_access_size = 8,
|
||||
};
|
||||
|
||||
static void fw_cfg_reset(DeviceState *d)
|
||||
{
|
||||
FWCfgState *s = FW_CFG(d);
|
||||
|
|
@ -399,6 +549,22 @@ static bool is_version_1(void *opaque, int version_id)
|
|||
return version_id == 1;
|
||||
}
|
||||
|
||||
static bool fw_cfg_dma_enabled(void *opaque)
|
||||
{
|
||||
FWCfgState *s = opaque;
|
||||
|
||||
return s->dma_enabled;
|
||||
}
|
||||
|
||||
static const VMStateDescription vmstate_fw_cfg_dma = {
|
||||
.name = "fw_cfg/dma",
|
||||
.needed = fw_cfg_dma_enabled,
|
||||
.fields = (VMStateField[]) {
|
||||
VMSTATE_UINT64(dma_addr, FWCfgState),
|
||||
VMSTATE_END_OF_LIST()
|
||||
},
|
||||
};
|
||||
|
||||
static const VMStateDescription vmstate_fw_cfg = {
|
||||
.name = "fw_cfg",
|
||||
.version_id = 2,
|
||||
|
|
@ -408,6 +574,10 @@ static const VMStateDescription vmstate_fw_cfg = {
|
|||
VMSTATE_UINT16_HACK(cur_offset, FWCfgState, is_version_1),
|
||||
VMSTATE_UINT32_V(cur_offset, FWCfgState, 2),
|
||||
VMSTATE_END_OF_LIST()
|
||||
},
|
||||
.subsections = (const VMStateDescription*[]) {
|
||||
&vmstate_fw_cfg_dma,
|
||||
NULL,
|
||||
}
|
||||
};
|
||||
|
||||
|
|
@ -593,7 +763,6 @@ static void fw_cfg_init1(DeviceState *dev)
|
|||
qdev_init_nofail(dev);
|
||||
|
||||
fw_cfg_add_bytes(s, FW_CFG_SIGNATURE, (char *)"QEMU", 4);
|
||||
fw_cfg_add_i32(s, FW_CFG_ID, 1);
|
||||
fw_cfg_add_bytes(s, FW_CFG_UUID, qemu_uuid, 16);
|
||||
fw_cfg_add_i16(s, FW_CFG_NOGRAPHIC, (uint16_t)(display_type == DT_NOGRAPHIC));
|
||||
fw_cfg_add_i16(s, FW_CFG_NB_CPUS, (uint16_t)smp_cpus);
|
||||
|
|
@ -605,25 +774,53 @@ static void fw_cfg_init1(DeviceState *dev)
|
|||
qemu_add_machine_init_done_notifier(&s->machine_ready);
|
||||
}
|
||||
|
||||
FWCfgState *fw_cfg_init_io(uint32_t iobase)
|
||||
FWCfgState *fw_cfg_init_io_dma(uint32_t iobase, uint32_t dma_iobase,
|
||||
AddressSpace *dma_as)
|
||||
{
|
||||
DeviceState *dev;
|
||||
FWCfgState *s;
|
||||
uint32_t version = FW_CFG_VERSION;
|
||||
bool dma_enabled = dma_iobase && dma_as;
|
||||
|
||||
dev = qdev_create(NULL, TYPE_FW_CFG_IO);
|
||||
qdev_prop_set_uint32(dev, "iobase", iobase);
|
||||
fw_cfg_init1(dev);
|
||||
qdev_prop_set_uint32(dev, "dma_iobase", dma_iobase);
|
||||
qdev_prop_set_bit(dev, "dma_enabled", dma_enabled);
|
||||
|
||||
return FW_CFG(dev);
|
||||
fw_cfg_init1(dev);
|
||||
s = FW_CFG(dev);
|
||||
|
||||
if (dma_enabled) {
|
||||
/* 64 bits for the address field */
|
||||
s->dma_as = dma_as;
|
||||
s->dma_addr = 0;
|
||||
|
||||
version |= FW_CFG_VERSION_DMA;
|
||||
}
|
||||
|
||||
fw_cfg_add_i32(s, FW_CFG_ID, version);
|
||||
|
||||
return s;
|
||||
}
|
||||
|
||||
FWCfgState *fw_cfg_init_mem_wide(hwaddr ctl_addr, hwaddr data_addr,
|
||||
uint32_t data_width)
|
||||
FWCfgState *fw_cfg_init_io(uint32_t iobase)
|
||||
{
|
||||
return fw_cfg_init_io_dma(iobase, 0, NULL);
|
||||
}
|
||||
|
||||
FWCfgState *fw_cfg_init_mem_wide(hwaddr ctl_addr,
|
||||
hwaddr data_addr, uint32_t data_width,
|
||||
hwaddr dma_addr, AddressSpace *dma_as)
|
||||
{
|
||||
DeviceState *dev;
|
||||
SysBusDevice *sbd;
|
||||
FWCfgState *s;
|
||||
uint32_t version = FW_CFG_VERSION;
|
||||
bool dma_enabled = dma_addr && dma_as;
|
||||
|
||||
dev = qdev_create(NULL, TYPE_FW_CFG_MEM);
|
||||
qdev_prop_set_uint32(dev, "data_width", data_width);
|
||||
qdev_prop_set_bit(dev, "dma_enabled", dma_enabled);
|
||||
|
||||
fw_cfg_init1(dev);
|
||||
|
||||
|
|
@ -631,13 +828,25 @@ FWCfgState *fw_cfg_init_mem_wide(hwaddr ctl_addr, hwaddr data_addr,
|
|||
sysbus_mmio_map(sbd, 0, ctl_addr);
|
||||
sysbus_mmio_map(sbd, 1, data_addr);
|
||||
|
||||
return FW_CFG(dev);
|
||||
s = FW_CFG(dev);
|
||||
|
||||
if (dma_enabled) {
|
||||
s->dma_as = dma_as;
|
||||
s->dma_addr = 0;
|
||||
sysbus_mmio_map(sbd, 2, dma_addr);
|
||||
version |= FW_CFG_VERSION_DMA;
|
||||
}
|
||||
|
||||
fw_cfg_add_i32(s, FW_CFG_ID, version);
|
||||
|
||||
return s;
|
||||
}
|
||||
|
||||
FWCfgState *fw_cfg_init_mem(hwaddr ctl_addr, hwaddr data_addr)
|
||||
{
|
||||
return fw_cfg_init_mem_wide(ctl_addr, data_addr,
|
||||
fw_cfg_data_mem_ops.valid.max_access_size);
|
||||
fw_cfg_data_mem_ops.valid.max_access_size,
|
||||
0, NULL);
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -664,6 +873,9 @@ static const TypeInfo fw_cfg_info = {
|
|||
|
||||
static Property fw_cfg_io_properties[] = {
|
||||
DEFINE_PROP_UINT32("iobase", FWCfgIoState, iobase, -1),
|
||||
DEFINE_PROP_UINT32("dma_iobase", FWCfgIoState, dma_iobase, -1),
|
||||
DEFINE_PROP_BOOL("dma_enabled", FWCfgIoState, parent_obj.dma_enabled,
|
||||
false),
|
||||
DEFINE_PROP_END_OF_LIST(),
|
||||
};
|
||||
|
||||
|
|
@ -673,8 +885,15 @@ static void fw_cfg_io_realize(DeviceState *dev, Error **errp)
|
|||
SysBusDevice *sbd = SYS_BUS_DEVICE(dev);
|
||||
|
||||
memory_region_init_io(&s->comb_iomem, OBJECT(s), &fw_cfg_comb_mem_ops,
|
||||
FW_CFG(s), "fwcfg", FW_CFG_SIZE);
|
||||
FW_CFG(s), "fwcfg", FW_CFG_CTL_SIZE);
|
||||
sysbus_add_io(sbd, s->iobase, &s->comb_iomem);
|
||||
|
||||
if (FW_CFG(s)->dma_enabled) {
|
||||
memory_region_init_io(&FW_CFG(s)->dma_iomem, OBJECT(s),
|
||||
&fw_cfg_dma_mem_ops, FW_CFG(s), "fwcfg.dma",
|
||||
sizeof(dma_addr_t));
|
||||
sysbus_add_io(sbd, s->dma_iobase, &FW_CFG(s)->dma_iomem);
|
||||
}
|
||||
}
|
||||
|
||||
static void fw_cfg_io_class_init(ObjectClass *klass, void *data)
|
||||
|
|
@ -695,6 +914,8 @@ static const TypeInfo fw_cfg_io_info = {
|
|||
|
||||
static Property fw_cfg_mem_properties[] = {
|
||||
DEFINE_PROP_UINT32("data_width", FWCfgMemState, data_width, -1),
|
||||
DEFINE_PROP_BOOL("dma_enabled", FWCfgMemState, parent_obj.dma_enabled,
|
||||
false),
|
||||
DEFINE_PROP_END_OF_LIST(),
|
||||
};
|
||||
|
||||
|
|
@ -705,7 +926,7 @@ static void fw_cfg_mem_realize(DeviceState *dev, Error **errp)
|
|||
const MemoryRegionOps *data_ops = &fw_cfg_data_mem_ops;
|
||||
|
||||
memory_region_init_io(&s->ctl_iomem, OBJECT(s), &fw_cfg_ctl_mem_ops,
|
||||
FW_CFG(s), "fwcfg.ctl", FW_CFG_SIZE);
|
||||
FW_CFG(s), "fwcfg.ctl", FW_CFG_CTL_SIZE);
|
||||
sysbus_init_mmio(sbd, &s->ctl_iomem);
|
||||
|
||||
if (s->data_width > data_ops->valid.max_access_size) {
|
||||
|
|
@ -723,6 +944,13 @@ static void fw_cfg_mem_realize(DeviceState *dev, Error **errp)
|
|||
memory_region_init_io(&s->data_iomem, OBJECT(s), data_ops, FW_CFG(s),
|
||||
"fwcfg.data", data_ops->valid.max_access_size);
|
||||
sysbus_init_mmio(sbd, &s->data_iomem);
|
||||
|
||||
if (FW_CFG(s)->dma_enabled) {
|
||||
memory_region_init_io(&FW_CFG(s)->dma_iomem, OBJECT(s),
|
||||
&fw_cfg_dma_mem_ops, FW_CFG(s), "fwcfg.dma",
|
||||
sizeof(dma_addr_t));
|
||||
sysbus_init_mmio(sbd, &FW_CFG(s)->dma_iomem);
|
||||
}
|
||||
}
|
||||
|
||||
static void fw_cfg_mem_class_init(ObjectClass *klass, void *data)
|
||||
|
|
|
|||
|
|
@ -61,6 +61,15 @@ typedef struct FWCfgFiles {
|
|||
FWCfgFile f[];
|
||||
} FWCfgFiles;
|
||||
|
||||
/* Control as first field allows for different structures selected by this
|
||||
* field, which might be useful in the future
|
||||
*/
|
||||
typedef struct FWCfgDmaAccess {
|
||||
uint32_t control;
|
||||
uint32_t length;
|
||||
uint64_t address;
|
||||
} QEMU_PACKED FWCfgDmaAccess;
|
||||
|
||||
typedef void (*FWCfgCallback)(void *opaque, uint8_t *data);
|
||||
typedef void (*FWCfgReadCallback)(void *opaque, uint32_t offset);
|
||||
|
||||
|
|
@ -77,10 +86,13 @@ void fw_cfg_add_file_callback(FWCfgState *s, const char *filename,
|
|||
void *data, size_t len);
|
||||
void *fw_cfg_modify_file(FWCfgState *s, const char *filename, void *data,
|
||||
size_t len);
|
||||
FWCfgState *fw_cfg_init_io_dma(uint32_t iobase, uint32_t dma_iobase,
|
||||
AddressSpace *dma_as);
|
||||
FWCfgState *fw_cfg_init_io(uint32_t iobase);
|
||||
FWCfgState *fw_cfg_init_mem(hwaddr ctl_addr, hwaddr data_addr);
|
||||
FWCfgState *fw_cfg_init_mem_wide(hwaddr ctl_addr, hwaddr data_addr,
|
||||
uint32_t data_width);
|
||||
FWCfgState *fw_cfg_init_mem_wide(hwaddr ctl_addr,
|
||||
hwaddr data_addr, uint32_t data_width,
|
||||
hwaddr dma_addr, AddressSpace *dma_as);
|
||||
|
||||
FWCfgState *fw_cfg_find(void);
|
||||
|
||||
|
|
|
|||
|
|
@ -2724,13 +2724,18 @@ ETEXI
|
|||
|
||||
DEF("fw_cfg", HAS_ARG, QEMU_OPTION_fwcfg,
|
||||
"-fw_cfg [name=]<name>,file=<file>\n"
|
||||
" add named fw_cfg entry from file\n",
|
||||
" add named fw_cfg entry from file\n"
|
||||
"-fw_cfg [name=]<name>,string=<str>\n"
|
||||
" add named fw_cfg entry from string\n",
|
||||
QEMU_ARCH_ALL)
|
||||
STEXI
|
||||
@item -fw_cfg [name=]@var{name},file=@var{file}
|
||||
@findex -fw_cfg
|
||||
Add named fw_cfg entry from file. @var{name} determines the name of
|
||||
the entry in the fw_cfg file directory exposed to the guest.
|
||||
|
||||
@item -fw_cfg [name=]@var{name},string=@var{str}
|
||||
Add named fw_cfg entry from string.
|
||||
ETEXI
|
||||
|
||||
DEF("serial", HAS_ARG, QEMU_OPTION_serial, \
|
||||
|
|
|
|||
|
|
@ -37,7 +37,9 @@ static void test_fw_cfg_signature(void)
|
|||
|
||||
static void test_fw_cfg_id(void)
|
||||
{
|
||||
g_assert_cmpint(qfw_cfg_get_u32(fw_cfg, FW_CFG_ID), ==, 1);
|
||||
uint32_t id = qfw_cfg_get_u32(fw_cfg, FW_CFG_ID);
|
||||
g_assert((id == 1) ||
|
||||
(id == 3));
|
||||
}
|
||||
|
||||
static void test_fw_cfg_uuid(void)
|
||||
|
|
|
|||
33
vl.c
33
vl.c
|
|
@ -512,6 +512,10 @@ static QemuOptsList qemu_fw_cfg_opts = {
|
|||
.type = QEMU_OPT_STRING,
|
||||
.help = "Sets the name of the file from which\n"
|
||||
"the fw_cfg blob will be loaded",
|
||||
}, {
|
||||
.name = "string",
|
||||
.type = QEMU_OPT_STRING,
|
||||
.help = "Sets content of the blob to be inserted from a string",
|
||||
},
|
||||
{ /* end of list */ }
|
||||
},
|
||||
|
|
@ -2239,11 +2243,16 @@ char *qemu_find_file(int type, const char *name)
|
|||
return NULL;
|
||||
}
|
||||
|
||||
static inline bool nonempty_str(const char *str)
|
||||
{
|
||||
return str && *str;
|
||||
}
|
||||
|
||||
static int parse_fw_cfg(void *opaque, QemuOpts *opts, Error **errp)
|
||||
{
|
||||
gchar *buf;
|
||||
size_t size;
|
||||
const char *name, *file;
|
||||
const char *name, *file, *str;
|
||||
|
||||
if (opaque == NULL) {
|
||||
error_report("fw_cfg device not available");
|
||||
|
|
@ -2251,8 +2260,15 @@ static int parse_fw_cfg(void *opaque, QemuOpts *opts, Error **errp)
|
|||
}
|
||||
name = qemu_opt_get(opts, "name");
|
||||
file = qemu_opt_get(opts, "file");
|
||||
if (name == NULL || *name == '\0' || file == NULL || *file == '\0') {
|
||||
error_report("invalid argument value");
|
||||
str = qemu_opt_get(opts, "string");
|
||||
|
||||
/* we need name and either a file or the content string */
|
||||
if (!(nonempty_str(name) && (nonempty_str(file) || nonempty_str(str)))) {
|
||||
error_report("invalid argument(s)");
|
||||
return -1;
|
||||
}
|
||||
if (nonempty_str(file) && nonempty_str(str)) {
|
||||
error_report("file and string are mutually exclusive");
|
||||
return -1;
|
||||
}
|
||||
if (strlen(name) > FW_CFG_MAX_FILE_PATH - 1) {
|
||||
|
|
@ -2263,9 +2279,14 @@ static int parse_fw_cfg(void *opaque, QemuOpts *opts, Error **errp)
|
|||
error_report("WARNING: externally provided fw_cfg item names "
|
||||
"should be prefixed with \"opt/\"!");
|
||||
}
|
||||
if (!g_file_get_contents(file, &buf, &size, NULL)) {
|
||||
error_report("can't load %s", file);
|
||||
return -1;
|
||||
if (nonempty_str(str)) {
|
||||
size = strlen(str); /* NUL terminator NOT included in fw_cfg blob */
|
||||
buf = g_memdup(str, size);
|
||||
} else {
|
||||
if (!g_file_get_contents(file, &buf, &size, NULL)) {
|
||||
error_report("can't load %s", file);
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
fw_cfg_add_file((FWCfgState *)opaque, name, buf, size);
|
||||
return 0;
|
||||
|
|
|
|||
Loading…
Reference in New Issue