Hi,
Thank you for reviewing this!
On 11/27/19 6:24 PM, Andre Przywara wrote:
> On Mon, 25 Nov 2019 10:30:19 +0000
> Alexandru Elisei <alexandru.elisei@xxxxxxx> wrote:
>
> Hi,
>
>> From: Sami Mujawar <sami.mujawar@xxxxxxx>
>>
>> According to the 'PCI Local Bus Specification, Revision 3.0,
>> February 3, 2004, Section 6.2.5.1, Implementation Notes, page 227'
>>
>> "Software saves the original value of the Base Address register,
>> writes 0 FFFF FFFFh to the register, then reads it back. Size
>> calculation can be done from the 32-bit value read by first
>> clearing encoding information bits (bit 0 for I/O, bits 0-3 for
>> memory), inverting all 32 bits (logical NOT), then incrementing
>> by 1. The resultant 32-bit value is the memory/I/O range size
>> decoded by the register. Note that the upper 16 bits of the result
>> is ignored if the Base Address register is for I/O and bits 16-31
>> returned zero upon read."
>>
>> kvmtool was returning the actual BAR resource size which would be
>> incorrect as the software software drivers would invert all 32 bits
>> (logical NOT), then incrementing by 1. This ends up with a very large
>> resource size (in some cases more than 4GB) due to which drivers
>> assert/fail to work.
>>
>> e.g if the BAR resource size was 0x1000, kvmtool would return 0x1000
>> instead of 0xFFFFF00x.
>>
>> Fixed pci__config_wr() to return the size of the BAR in accordance with
>> the PCI Local Bus specification, Implementation Notes.
>>
>> Cc: julien.thierry.kdev@xxxxxxxxx
>> Signed-off-by: Sami Mujawar <sami.mujawar@xxxxxxx>
>> Signed-off-by: Julien Thierry <julien.thierry@xxxxxxx>
>> [Reworked algorithm, removed power-of-two check]
>> Signed-off-by: Alexandru Elisei <alexandru.elisei@xxxxxxx>
>> ---
>> pci.c | 42 ++++++++++++++++++++++++++++++++++++------
>> 1 file changed, 36 insertions(+), 6 deletions(-)
>>
>> diff --git a/pci.c b/pci.c
>> index 689869cb79a3..e1b57325bdeb 100644
>> --- a/pci.c
>> +++ b/pci.c
>> @@ -149,6 +149,7 @@ void pci__config_wr(struct kvm *kvm, union pci_config_address addr, void *data,
>> u8 bar, offset;
>> struct pci_device_header *pci_hdr;
>> u8 dev_num = addr.device_number;
>> + u32 value = 0;
>>
>> if (!pci_device_exists(addr.bus_number, dev_num, 0))
>> return;
>> @@ -169,13 +170,42 @@ void pci__config_wr(struct kvm *kvm, union pci_config_address addr, void *data,
>> bar = (offset - PCI_BAR_OFFSET(0)) / sizeof(u32);
>>
>> /*
>> - * If the kernel masks the BAR it would expect to find the size of the
>> - * BAR there next time it reads from it. When the kernel got the size it
>> - * would write the address back.
>> + * If the kernel masks the BAR, it will expect to find the size of the
>> + * BAR there next time it reads from it. After the kernel reads the
>> + * size, it will write the address back.
>> */
>> - if (bar < 6 && ioport__read32(data) == 0xFFFFFFFF) {
>> - u32 sz = pci_hdr->bar_size[bar];
>> - memcpy(base + offset, &sz, sizeof(sz));
>> + if (bar < 6) {
>> + memcpy(&value, data, size);
>> + if (value == 0xffffffff)
>> + /*
>> + * According to the PCI local bus specification REV 3.0:
> So this whole comment breaks 80 columns. Can we just move it one level up/left, putting it before the if statement? This also fixes the confusing indentation below.
Good idea, will do.
>
>> + * The number of upper bits that a device actually implements
>> + * depends on how much of the address space the device will
>> + * respond to. A device that wants a 1 MB memory address space
>> + * (using a 32-bit base address register) would build the top
>> + * 12 bits of the address register, hardwiring the other bits
>> + * to 0.
>> + *
>> + * Furthermore, software can determine how much address space
>> + * the device requires by writing a value of all 1's to the
>> + * register and then reading the value back. The device will
>> + * return 0's in all don't-care address bits, effectively
>> + * specifying the address space required.
>> + *
>> + * Software computes the size of the address space with the
>> + * formula S = ~B + 1, where S is the memory size and B is the
>> + * value read from the BAR. This means that the BAR value that
>> + * kvmtool should return is B = ~(S - 1).
>> + */
>> + value = ~(pci_hdr->bar_size[bar] - 1);
>> + if (pci_hdr->bar[bar] & 0x1)
> Should this be PCI_BASE_ADDRESS_SPACE_IO, for clarity?
Yes, that's better, will change.
>
>> + value = (value & PCI_BASE_ADDRESS_IO_MASK) | \
> backslash not needed
>
>> + PCI_BASE_ADDRESS_SPACE_IO;
>> + else
>> + /* Memory Space BAR, preserve the first 4 bits. */
>> + value = (value & PCI_BASE_ADDRESS_MEM_MASK) | \
> same here.
I'll remove both.
Thanks,
Alex
>> + (pci_hdr->bar[bar] & ~PCI_BASE_ADDRESS_MEM_MASK);
>> + memcpy(base + offset, &value, size);
>> } else {
>> memcpy(base + offset, data, size);
>> }
> Cheers,
> Andre.
