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

nvme_disk: Refactor 64-bit BAR handling into nvme_pcicfg_get_bar_addr_len.

Browse Source 
Then invoke this function in nvme_pcicfg_map_bar instead of duplicating
the logic.
This commit is contained in:
Augustin Cavalier
2022-07-06 13:42:43 -04:00
parent 5e0c100f78
commit 138d4bbd68
1 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/drivers/disk/nvme/compat/libnvme_haiku.cpp
+17 -17
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 2019, Haiku, Inc. All rights reserved. * Copyright 2019-2022, Haiku, Inc. All rights reserved.
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
* *
* Authors: * Authors:
@@ -122,20 +122,32 @@ nvme_pcicfg_write32(struct pci_device* dev, uint32_t value, uint32_t offset)
} }
int void
nvme_pcicfg_map_bar(void* devhandle, unsigned int bar, bool read_only, nvme_pcicfg_get_bar_addr_len(void* devhandle, unsigned int bar,
void** mapped_addr) uint64_t* _addr, uint64_t* _size)
{ {
struct pci_device* dev = (struct pci_device*)devhandle; struct pci_device* dev = (struct pci_device*)devhandle;
pci_info* info = (pci_info*)dev->pci_info; pci_info* info = (pci_info*)dev->pci_info;
phys_addr_t addr = info->u.h0.base_registers[bar]; phys_addr_t addr = info->u.h0.base_registers[bar];
uint64 size = info->u.h0.base_register_sizes[bar]; phys_size_t size = info->u.h0.base_register_sizes[bar];
if ((info->u.h0.base_register_flags[bar] & PCI_address_type) == PCI_address_type_64) { if ((info->u.h0.base_register_flags[bar] & PCI_address_type) == PCI_address_type_64) {
addr |= (uint64)info->u.h0.base_registers[bar + 1] << 32; addr |= (uint64)info->u.h0.base_registers[bar + 1] << 32;
size |= (uint64)info->u.h0.base_register_sizes[bar + 1] << 32; size |= (uint64)info->u.h0.base_register_sizes[bar + 1] << 32;
} }
*_addr = addr;
*_size = size;
}
int
nvme_pcicfg_map_bar(void* devhandle, unsigned int bar, bool read_only,
void** mapped_addr)
{
phys_addr_t addr, size;
nvme_pcicfg_get_bar_addr_len(devhandle, bar, &addr, &size);
area_id area = map_physical_memory("nvme mapped bar", addr, size, area_id area = map_physical_memory("nvme mapped bar", addr, size,
B_ANY_KERNEL_ADDRESS, B_KERNEL_READ_AREA | (read_only ? 0 : B_KERNEL_WRITE_AREA), B_ANY_KERNEL_ADDRESS, B_KERNEL_READ_AREA | (read_only ? 0 : B_KERNEL_WRITE_AREA),
mapped_addr); mapped_addr);
@@ -170,18 +182,6 @@ nvme_pcicfg_unmap_bar(void* devhandle, unsigned int bar, void* addr)
} }
void
nvme_pcicfg_get_bar_addr_len(void* devhandle, unsigned int bar,
uint64_t* addr, uint64_t* size)
{
struct pci_device* dev = (struct pci_device*)devhandle;
pci_info* info = (pci_info*)dev->pci_info;
*addr = info->u.h0.base_registers[bar];
*size = info->u.h0.base_register_sizes[bar];
}
// #pragma mark - logging // #pragma mark - logging