feb0b1aa11
For configurations of the pflash_cfi01 device which set it up with a
device-width not equal to the width (ie where we are emulating
multiple narrow flash devices wired up in parallel), we were giving
incorrect values in the CFI data table:
(1) the sector length entry should specify the sector length for a
single device, not the length for the overall collection of
devices
(2) the number of blocks per device must not be divided by the
number of devices because the resulting device size would not
match the overall size
(3) this then means that the overall write block size must be
modified depending on the number of devices because the entry is
per device and when the guest writes into the flash it
calculates the write size by using the CFI entry (write size
per device) multiplied by the number of chips.
(It would alternatively be possible to modify the write
block size in the CFI table (currently hardcoded at 2048) and
leave the overall write block size alone.)
This commit corrects these bugs, and adds a hw-compat property
to retain the old behaviour on 2.8 and earlier versions. (The
only board we have which uses this sort of flash config and
has machine versioning is the "virt" board -- the PC uses a
single flash device and so behaviour is unaffected whether
using old-multiple-chip-handling or not.)
Here is a configuration example from the vexpress board:
VEXPRESS_FLASH_SIZE = 64M
VEXPRESS_FLASH_SECT_SIZE 256K
num-blocks = VEXPRESS_FLASH_SIZE / VEXPRESS_FLASH_SECT_SIZE = 256
sector-length = 256K
width = 4
device-width = 2
The code will fill the CFI entry with the following entries:
num-blocks = 256
sector-length = 128K
writeblock_size = 2048
This results in two chips, each with 256 * 128K = 32M device size and
a write block size of 2048.
A sector erase will be sent to both chips, thus 256K must be erased.
When the guest sends a block write command, it will write 4096 bytes
data at once (2048 per device).
Signed-off-by: David Engraf <david.engraf@sysgo.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
[PMM: cleaned up and expanded commit message]
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
170 lines
4.2 KiB
C
170 lines
4.2 KiB
C
#ifndef HW_COMPAT_H
|
|
#define HW_COMPAT_H
|
|
|
|
#define HW_COMPAT_2_8 \
|
|
{\
|
|
.driver = "fw_cfg_mem",\
|
|
.property = "x-file-slots",\
|
|
.value = stringify(0x10),\
|
|
},{\
|
|
.driver = "fw_cfg_io",\
|
|
.property = "x-file-slots",\
|
|
.value = stringify(0x10),\
|
|
},{\
|
|
.driver = "pflash_cfi01",\
|
|
.property = "old-multiple-chip-handling",\
|
|
.value = "on",\
|
|
},
|
|
|
|
#define HW_COMPAT_2_7 \
|
|
{\
|
|
.driver = "virtio-pci",\
|
|
.property = "page-per-vq",\
|
|
.value = "on",\
|
|
},{\
|
|
.driver = "virtio-serial-device",\
|
|
.property = "emergency-write",\
|
|
.value = "off",\
|
|
},{\
|
|
.driver = "ioapic",\
|
|
.property = "version",\
|
|
.value = "0x11",\
|
|
},{\
|
|
.driver = "intel-iommu",\
|
|
.property = "x-buggy-eim",\
|
|
.value = "true",\
|
|
},{\
|
|
.driver = "virtio-pci",\
|
|
.property = "x-ignore-backend-features",\
|
|
.value = "on",\
|
|
},
|
|
|
|
#define HW_COMPAT_2_6 \
|
|
{\
|
|
.driver = "virtio-mmio",\
|
|
.property = "format_transport_address",\
|
|
.value = "off",\
|
|
},{\
|
|
.driver = "virtio-pci",\
|
|
.property = "disable-modern",\
|
|
.value = "on",\
|
|
},{\
|
|
.driver = "virtio-pci",\
|
|
.property = "disable-legacy",\
|
|
.value = "off",\
|
|
},
|
|
|
|
#define HW_COMPAT_2_5 \
|
|
{\
|
|
.driver = "isa-fdc",\
|
|
.property = "fallback",\
|
|
.value = "144",\
|
|
},{\
|
|
.driver = "pvscsi",\
|
|
.property = "x-old-pci-configuration",\
|
|
.value = "on",\
|
|
},{\
|
|
.driver = "pvscsi",\
|
|
.property = "x-disable-pcie",\
|
|
.value = "on",\
|
|
},\
|
|
{\
|
|
.driver = "vmxnet3",\
|
|
.property = "x-old-msi-offsets",\
|
|
.value = "on",\
|
|
},{\
|
|
.driver = "vmxnet3",\
|
|
.property = "x-disable-pcie",\
|
|
.value = "on",\
|
|
},
|
|
|
|
#define HW_COMPAT_2_4 \
|
|
{\
|
|
.driver = "virtio-blk-device",\
|
|
.property = "scsi",\
|
|
.value = "true",\
|
|
},{\
|
|
.driver = "e1000",\
|
|
.property = "extra_mac_registers",\
|
|
.value = "off",\
|
|
},{\
|
|
.driver = "virtio-pci",\
|
|
.property = "x-disable-pcie",\
|
|
.value = "on",\
|
|
},{\
|
|
.driver = "virtio-pci",\
|
|
.property = "migrate-extra",\
|
|
.value = "off",\
|
|
},{\
|
|
.driver = "fw_cfg_mem",\
|
|
.property = "dma_enabled",\
|
|
.value = "off",\
|
|
},{\
|
|
.driver = "fw_cfg_io",\
|
|
.property = "dma_enabled",\
|
|
.value = "off",\
|
|
},
|
|
|
|
#define HW_COMPAT_2_3 \
|
|
{\
|
|
.driver = "virtio-blk-pci",\
|
|
.property = "any_layout",\
|
|
.value = "off",\
|
|
},{\
|
|
.driver = "virtio-balloon-pci",\
|
|
.property = "any_layout",\
|
|
.value = "off",\
|
|
},{\
|
|
.driver = "virtio-serial-pci",\
|
|
.property = "any_layout",\
|
|
.value = "off",\
|
|
},{\
|
|
.driver = "virtio-9p-pci",\
|
|
.property = "any_layout",\
|
|
.value = "off",\
|
|
},{\
|
|
.driver = "virtio-rng-pci",\
|
|
.property = "any_layout",\
|
|
.value = "off",\
|
|
},{\
|
|
.driver = TYPE_PCI_DEVICE,\
|
|
.property = "x-pcie-lnksta-dllla",\
|
|
.value = "off",\
|
|
},
|
|
|
|
#define HW_COMPAT_2_2 \
|
|
/* empty */
|
|
|
|
#define HW_COMPAT_2_1 \
|
|
{\
|
|
.driver = "intel-hda",\
|
|
.property = "old_msi_addr",\
|
|
.value = "on",\
|
|
},{\
|
|
.driver = "VGA",\
|
|
.property = "qemu-extended-regs",\
|
|
.value = "off",\
|
|
},{\
|
|
.driver = "secondary-vga",\
|
|
.property = "qemu-extended-regs",\
|
|
.value = "off",\
|
|
},{\
|
|
.driver = "virtio-scsi-pci",\
|
|
.property = "any_layout",\
|
|
.value = "off",\
|
|
},{\
|
|
.driver = "usb-mouse",\
|
|
.property = "usb_version",\
|
|
.value = stringify(1),\
|
|
},{\
|
|
.driver = "usb-kbd",\
|
|
.property = "usb_version",\
|
|
.value = stringify(1),\
|
|
},{\
|
|
.driver = "virtio-pci",\
|
|
.property = "virtio-pci-bus-master-bug-migration",\
|
|
.value = "on",\
|
|
},
|
|
|
|
#endif /* HW_COMPAT_H */
|