i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

virtio_pci: accept any pci revision for modern devices

Browse Source 
as in the specification.

Change-Id: I74d667daea386d3189095542d8f515fc3711a910
Reviewed-on: https://review.haiku-os.org/c/haiku/+/8978
Reviewed-by: waddlesplash <[email protected]>
Tested-by: Commit checker robot <[email protected]>
This commit is contained in:
Jérôme Duval
2025-02-14 12:59:38 +00:00
committed by waddlesplash
parent 12b22e8e48
commit 74b5b25f77
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/busses/virtio/virtio_pci/virtio_pci.cpp
+7 -8
View File
@@ -635,7 +635,8 @@ init_bus(device_node* node, void** bus_cookie)
pci_info *pciInfo = &bus->info; pci_info *pciInfo = &bus->info;
pci->get_pci_info(device, pciInfo); pci->get_pci_info(device, pciInfo);
bus->virtio1 = pciInfo->revision == 1; bus->virtio1 = pciInfo->device_id >= VIRTIO_PCI_DEVICEID_MODERN_MIN
&& pciInfo->device_id <= VIRTIO_PCI_DEVICEID_MODERN_MAX;
if (bus->virtio1) { if (bus->virtio1) {
struct virtio_pci_cap common, isr, deviceCap; struct virtio_pci_cap common, isr, deviceCap;
@@ -791,12 +792,14 @@ register_child_devices(void* cookie)
(void**)&device); (void**)&device);
uint16 pciSubDeviceId = pci->read_pci_config(device, PCI_subsystem_id, 2); uint16 pciSubDeviceId = pci->read_pci_config(device, PCI_subsystem_id, 2);
uint8 pciRevision = pci->read_pci_config(device, PCI_revision, 1);
uint16 pciDeviceId = pci->read_pci_config(device, PCI_device_id, 2); uint16 pciDeviceId = pci->read_pci_config(device, PCI_device_id, 2);
uint8 virtioVersion = 0;
uint16 virtioDeviceId = pciSubDeviceId; uint16 virtioDeviceId = pciSubDeviceId;
if (pciDeviceId >= VIRTIO_PCI_DEVICEID_MODERN_MIN) if (pciDeviceId >= VIRTIO_PCI_DEVICEID_MODERN_MIN) {
virtioVersion = 1;
virtioDeviceId = pciDeviceId - VIRTIO_PCI_DEVICEID_MODERN_MIN; virtioDeviceId = pciDeviceId - VIRTIO_PCI_DEVICEID_MODERN_MIN;
}
char prettyName[25]; char prettyName[25];
sprintf(prettyName, "Virtio Device %" B_PRIu16, virtioDeviceId); sprintf(prettyName, "Virtio Device %" B_PRIu16, virtioDeviceId);
@@ -814,7 +817,7 @@ register_child_devices(void* cookie)
{ VIRTIO_VRING_ALIGNMENT_ITEM, B_UINT16_TYPE, { VIRTIO_VRING_ALIGNMENT_ITEM, B_UINT16_TYPE,
{ .ui16 = VIRTIO_PCI_VRING_ALIGN }}, { .ui16 = VIRTIO_PCI_VRING_ALIGN }},
{ VIRTIO_VERSION_ITEM, B_UINT8_TYPE, { VIRTIO_VERSION_ITEM, B_UINT8_TYPE,
{ .ui8 = pciRevision }}, { .ui8 = virtioVersion }},
{ NULL } { NULL }
}; };
@@ -881,10 +884,6 @@ supports_device(device_node* parent)
&& pciRevision != 0) { && pciRevision != 0) {
return 0.0f; return 0.0f;
} }
if (deviceID >= VIRTIO_PCI_DEVICEID_MODERN_MIN
&& deviceID <= VIRTIO_PCI_DEVICEID_MODERN_MAX
&& pciRevision != 1)
return 0.0f;
TRACE("Virtio device found! vendor 0x%04x, device 0x%04x\n", vendorID, TRACE("Virtio device found! vendor 0x%04x, device 0x%04x\n", vendorID,
deviceID); deviceID);