Commit 1dc6cc4b authored by Ohad Sharabi's avatar Ohad Sharabi Committed by Oded Gabbay
Browse files

habanalabs: duplicate HOP table props to MMU props 



In order to support several device MMU blocks with different
architectures (e.g. different HOP table size) we need to move to
per-MMU properties rather than keeping those properties as ASIC
properties.

Refactoring the code to use "per-MMU proprties" is a major effort.

To start making the transition towards this goal but still support
taking the properties from ASIC properties (for code that currently
uses them) this patch copies some of the properties to the "per-MMU"
properties and later, when implementing the per-MMU properties, we
would be able to delete the MMU props from the ASIC props.

Signed-off-by: default avatarOhad Sharabi <osharabi@habana.ai>
Reviewed-by: default avatarOded Gabbay <ogabbay@kernel.org>
Signed-off-by: default avatarOded Gabbay <ogabbay@kernel.org>
parent e24a62cb

drivers/misc/habanalabs/gaudi/gaudi.c

+3 −0
Original line number Diff line number Diff line
@@ -613,6 +613,9 @@ static int gaudi_set_fixed_properties(struct hl_device *hdev) 
	prop->pmmu.page_size = PAGE_SIZE_4KB;

	prop->pmmu.num_hops = MMU_ARCH_5_HOPS;

	prop->pmmu.last_mask = LAST_MASK;

	/* TODO: will be duplicated until implementing per-MMU props */

	prop->pmmu.hop_table_size = prop->mmu_hop_table_size;

	prop->pmmu.hop0_tables_total_size = prop->mmu_hop0_tables_total_size;



	/* PMMU and HPMMU are the same except of page size */

	memcpy(&prop->pmmu_huge, &prop->pmmu, sizeof(prop->pmmu));

drivers/misc/habanalabs/goya/goya.c

+6 −0
Original line number Diff line number Diff line
@@ -430,6 +430,9 @@ int goya_set_fixed_properties(struct hl_device *hdev) 
	prop->dmmu.page_size = PAGE_SIZE_2MB;

	prop->dmmu.num_hops = MMU_ARCH_5_HOPS;

	prop->dmmu.last_mask = LAST_MASK;

	/* TODO: will be duplicated until implementing per-MMU props */

	prop->dmmu.hop_table_size = prop->mmu_hop_table_size;

	prop->dmmu.hop0_tables_total_size = prop->mmu_hop0_tables_total_size;



	/* shifts and masks are the same in PMMU and DMMU */

	memcpy(&prop->pmmu, &prop->dmmu, sizeof(prop->dmmu));
@@ -438,6 +441,9 @@ int goya_set_fixed_properties(struct hl_device *hdev) 
	prop->pmmu.page_size = PAGE_SIZE_4KB;

	prop->pmmu.num_hops = MMU_ARCH_5_HOPS;

	prop->pmmu.last_mask = LAST_MASK;

	/* TODO: will be duplicated until implementing per-MMU props */

	prop->pmmu.hop_table_size = prop->mmu_hop_table_size;

	prop->pmmu.hop0_tables_total_size = prop->mmu_hop0_tables_total_size;



	/* PMMU and HPMMU are the same except of page size */

	memcpy(&prop->pmmu_huge, &prop->pmmu, sizeof(prop->pmmu));