mirror of
https://github.com/torvalds/linux.git
synced 2026-05-24 07:03:03 +02:00
iommu/amd: Use roundup_pow_two() instead of get_order()
If x >= PAGE_SIZE then: 1 << (get_order(x) + PAGE_SHIFT) == roundup_pow_two() Inline this into the only caller, compute the size of the HW device table in terms of 4K pages which matches the HW definition. Tested-by: Alejandro Jimenez <alejandro.j.jimenez@oracle.com> Signed-off-by: Jason Gunthorpe <jgg@nvidia.com> Link: https://lore.kernel.org/r/17-v4-c8663abbb606+3f7-iommu_pages_jgg@nvidia.com Signed-off-by: Joerg Roedel <jroedel@suse.de>
This commit is contained in:
parent
e874c666b1
commit
5faa04c4ed
|
|
@ -243,14 +243,6 @@ static void init_translation_status(struct amd_iommu *iommu)
|
|||
iommu->flags |= AMD_IOMMU_FLAG_TRANS_PRE_ENABLED;
|
||||
}
|
||||
|
||||
static inline unsigned long tbl_size(int entry_size, int last_bdf)
|
||||
{
|
||||
unsigned shift = PAGE_SHIFT +
|
||||
get_order((last_bdf + 1) * entry_size);
|
||||
|
||||
return 1UL << shift;
|
||||
}
|
||||
|
||||
int amd_iommu_get_num_iommus(void)
|
||||
{
|
||||
return amd_iommus_present;
|
||||
|
|
@ -1595,7 +1587,9 @@ static struct amd_iommu_pci_seg *__init alloc_pci_segment(u16 id,
|
|||
|
||||
pci_seg->last_bdf = last_bdf;
|
||||
DUMP_printk("PCI segment : 0x%0x, last bdf : 0x%04x\n", id, last_bdf);
|
||||
pci_seg->dev_table_size = tbl_size(DEV_TABLE_ENTRY_SIZE, last_bdf);
|
||||
pci_seg->dev_table_size =
|
||||
max(roundup_pow_of_two((last_bdf + 1) * DEV_TABLE_ENTRY_SIZE),
|
||||
SZ_4K);
|
||||
|
||||
pci_seg->id = id;
|
||||
init_llist_head(&pci_seg->dev_data_list);
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user