Commit 89473a1f authored by farah kassabri's avatar farah kassabri Committed by Oded Gabbay
Browse files

habanalabs: fix MMU debugfs related nodes 



In mmu debugfs node show un-scrambled physical addresses.
before read/write through data nodes, need to unscramble the
physical address before using it for pci transaction.

Signed-off-by: default avatarfarah kassabri <fkassabri@habana.ai>
Reviewed-by: default avatarOded Gabbay <ogabbay@kernel.org>
Signed-off-by: default avatarOded Gabbay <ogabbay@kernel.org>
parent e1fa724d

drivers/misc/habanalabs/common/debugfs.c

+15 −6
Original line number Diff line number Diff line
@@ -310,8 +310,8 @@ static int mmu_show(struct seq_file *s, void *data) 
	struct hl_dbg_device_entry *dev_entry = entry->dev_entry;

	struct hl_device *hdev = dev_entry->hdev;

	struct hl_ctx *ctx;

	struct hl_mmu_hop_info hops_info;

	u64 virt_addr = dev_entry->mmu_addr;

	struct hl_mmu_hop_info hops_info = {0};

	u64 virt_addr = dev_entry->mmu_addr, phys_addr;

	int i;



	if (!hdev->mmu_enable)
@@ -333,10 +333,19 @@ static int mmu_show(struct seq_file *s, void *data) 
		return 0;

	}



	phys_addr = hops_info.hop_info[hops_info.used_hops - 1].hop_pte_val;



	if (hops_info.scrambled_vaddr &&

		(dev_entry->mmu_addr != hops_info.scrambled_vaddr))

		seq_printf(s,

		"asid: %u, virt_addr: 0x%llx, scrambled virt_addr: 0x%llx\n",

			"asid: %u, virt_addr: 0x%llx, scrambled virt_addr: 0x%llx,\nphys_addr: 0x%llx, scrambled_phys_addr: 0x%llx\n",

			dev_entry->mmu_asid, dev_entry->mmu_addr,

		hops_info.scrambled_vaddr);

			hops_info.scrambled_vaddr,

			hops_info.unscrambled_paddr, phys_addr);

	else

		seq_printf(s,

			"asid: %u, virt_addr: 0x%llx, phys_addr: 0x%llx\n",

			dev_entry->mmu_asid, dev_entry->mmu_addr, phys_addr);



	for (i = 0 ; i < hops_info.used_hops ; i++) {

		seq_printf(s, "hop%d_addr: 0x%llx\n",

drivers/misc/habanalabs/common/habanalabs.h

+11 −3
Original line number Diff line number Diff line
@@ -851,8 +851,10 @@ enum div_select_defs { 
 * @collective_wait_init_cs: Generate collective master/slave packets

 *                           and place them in the relevant cs jobs

 * @collective_wait_create_jobs: allocate collective wait cs jobs

 * @scramble_vaddr: Routine to scramble the virtual address prior of mapping it

 * @scramble_addr: Routine to scramble the address prior of mapping it

 *                  in the MMU.

 * @descramble_addr: Routine to de-scramble the address prior of

 *                  showing it to users.

 * @ack_protection_bits_errors: ack and dump all security violations

 */

struct hl_asic_funcs {
@@ -963,7 +965,8 @@ struct hl_asic_funcs { 
	int (*collective_wait_create_jobs)(struct hl_device *hdev,

			struct hl_ctx *ctx, struct hl_cs *cs, u32 wait_queue_id,

			u32 collective_engine_id);

	u64 (*scramble_vaddr)(struct hl_device *hdev, u64 virt_addr);

	u64 (*scramble_addr)(struct hl_device *hdev, u64 addr);

	u64 (*descramble_addr)(struct hl_device *hdev, u64 addr);

	void (*ack_protection_bits_errors)(struct hl_device *hdev);

};
@@ -1726,13 +1729,17 @@ struct hl_mmu_per_hop_info { 
 * @scrambled_vaddr: The value of the virtual address after scrambling. This

 *                   address replaces the original virtual-address when mapped

 *                   in the MMU tables.

 * @unscrambled_paddr: The un-scrambled physical address.

 * @hop_info: Array holding the per-hop information used for the translation.

 * @used_hops: The number of hops used for the translation.

 * @range_type: virtual address range type.

 */

struct hl_mmu_hop_info {

	u64 scrambled_vaddr;

	u64 unscrambled_paddr;

	struct hl_mmu_per_hop_info hop_info[MMU_ARCH_5_HOPS];

	u32 used_hops;

	enum hl_va_range_type range_type;

};



/**
@@ -2222,7 +2229,8 @@ void hl_mmu_v1_set_funcs(struct hl_device *hdev, struct hl_mmu_funcs *mmu); 
int hl_mmu_va_to_pa(struct hl_ctx *ctx, u64 virt_addr, u64 *phys_addr);

int hl_mmu_get_tlb_info(struct hl_ctx *ctx, u64 virt_addr,

			struct hl_mmu_hop_info *hops);

u64 hl_mmu_scramble_vaddr(struct hl_device *hdev, u64 virt_addr);

u64 hl_mmu_scramble_addr(struct hl_device *hdev, u64 addr);

u64 hl_mmu_descramble_addr(struct hl_device *hdev, u64 addr);

bool hl_is_dram_va(struct hl_device *hdev, u64 virt_addr);



int hl_fw_load_fw_to_device(struct hl_device *hdev, const char *fw_name,

drivers/misc/habanalabs/common/mmu/mmu.c

+63 −11
Original line number Diff line number Diff line
@@ -287,9 +287,9 @@ int hl_mmu_map_page(struct hl_ctx *ctx, u64 virt_addr, u64 phys_addr, 
	 * after scrambling)

	 */

	if ((is_dram_addr &&

			((hdev->asic_funcs->scramble_vaddr(hdev, phys_addr) &

			((hdev->asic_funcs->scramble_addr(hdev, phys_addr) &

				(mmu_prop->page_size - 1)) ||

			(hdev->asic_funcs->scramble_vaddr(hdev, virt_addr) &

			(hdev->asic_funcs->scramble_addr(hdev, virt_addr) &

				(mmu_prop->page_size - 1)))) ||

		(!is_dram_addr && ((phys_addr & (real_page_size - 1)) ||

				(virt_addr & (real_page_size - 1)))))
@@ -476,19 +476,53 @@ void hl_mmu_swap_in(struct hl_ctx *ctx) 
		hdev->mmu_func[MMU_HR_PGT].swap_in(ctx);

}



static void hl_mmu_pa_page_with_offset(struct hl_ctx *ctx, u64 virt_addr,

						struct hl_mmu_hop_info *hops,

						u64 *phys_addr)

{

	struct hl_device *hdev = ctx->hdev;

	struct asic_fixed_properties *prop = &hdev->asic_prop;

	u64 offset_mask, addr_mask, hop_shift, tmp_phys_addr;

	u32 hop0_shift_off;

	void *p;



	/* last hop holds the phys address and flags */

	if (hops->unscrambled_paddr)

		tmp_phys_addr = hops->unscrambled_paddr;

	else

		tmp_phys_addr = hops->hop_info[hops->used_hops - 1].hop_pte_val;



	if (hops->range_type == HL_VA_RANGE_TYPE_HOST_HUGE)

		p = &prop->pmmu_huge;

	else if (hops->range_type == HL_VA_RANGE_TYPE_HOST)

		p = &prop->pmmu;

	else /* HL_VA_RANGE_TYPE_DRAM */

		p = &prop->dmmu;



	/*

	 * find the correct hop shift field in hl_mmu_properties structure

	 * in order to determine the right maks for the page offset.

	 */

	hop0_shift_off = offsetof(struct hl_mmu_properties, hop0_shift);

	p = (char *)p + hop0_shift_off;

	p = (char *)p + ((hops->used_hops - 1) * sizeof(u64));

	hop_shift = *(u64 *)p;

	offset_mask = (1 << hop_shift) - 1;

	addr_mask = ~(offset_mask);

	*phys_addr = (tmp_phys_addr & addr_mask) |

					(virt_addr & offset_mask);

}



int hl_mmu_va_to_pa(struct hl_ctx *ctx, u64 virt_addr, u64 *phys_addr)

{

	struct hl_mmu_hop_info hops;

	u64 tmp_addr;

	int rc;



	rc = hl_mmu_get_tlb_info(ctx, virt_addr, &hops);

	if (rc)

		return rc;



	/* last hop holds the phys address and flags */

	tmp_addr = hops.hop_info[hops.used_hops - 1].hop_pte_val;

	*phys_addr = (tmp_addr & HOP_PHYS_ADDR_MASK) | (virt_addr & FLAGS_MASK);

	hl_mmu_pa_page_with_offset(ctx, virt_addr, &hops,  phys_addr);



	return 0;

}
@@ -525,6 +559,11 @@ int hl_mmu_get_tlb_info(struct hl_ctx *ctx, u64 virt_addr, 


	mutex_unlock(&ctx->mmu_lock);



	/* add page offset to physical address */

	if (hops->unscrambled_paddr)

		hl_mmu_pa_page_with_offset(ctx, virt_addr, hops,

					&hops->unscrambled_paddr);



	return rc;

}
@@ -548,13 +587,26 @@ int hl_mmu_if_set_funcs(struct hl_device *hdev) 
}



/**

 * hl_mmu_scramble_vaddr() - The generic mmu virtual address scrambling routine.

 * hl_mmu_scramble_addr() - The generic mmu address scrambling routine.

 * @hdev: pointer to device data.

 * @addr: The address to scramble.

 *

 * Return: The scrambled address.

 */

u64 hl_mmu_scramble_addr(struct hl_device *hdev, u64 addr)

{

	return addr;

}



/**

 * hl_mmu_descramble_addr() - The generic mmu address descrambling

 * routine.

 * @hdev: pointer to device data.

 * @virt_addr: The virtual address to scramble.

 * @addr: The address to descramble.

 *

 * Return: The scrambled virtual address.

 * Return: The un-scrambled address.

 */

u64 hl_mmu_scramble_vaddr(struct hl_device *hdev, u64 virt_addr)

u64 hl_mmu_descramble_addr(struct hl_device *hdev, u64 addr)

{

	return virt_addr;

	return addr;

}

drivers/misc/habanalabs/gaudi/gaudi.c

+2 −1
Original line number Diff line number Diff line
@@ -8548,7 +8548,8 @@ static const struct hl_asic_funcs gaudi_funcs = { 
	.get_device_time = gaudi_get_device_time,

	.collective_wait_init_cs = gaudi_collective_wait_init_cs,

	.collective_wait_create_jobs = gaudi_collective_wait_create_jobs,

	.scramble_vaddr = hl_mmu_scramble_vaddr,

	.scramble_addr = hl_mmu_scramble_addr,

	.descramble_addr = hl_mmu_descramble_addr,

	.ack_protection_bits_errors = gaudi_ack_protection_bits_errors

};

drivers/misc/habanalabs/goya/goya.c

+2 −1
Original line number Diff line number Diff line
@@ -5459,7 +5459,8 @@ static const struct hl_asic_funcs goya_funcs = { 
	.get_device_time = goya_get_device_time,

	.collective_wait_init_cs = goya_collective_wait_init_cs,

	.collective_wait_create_jobs = goya_collective_wait_create_jobs,

	.scramble_vaddr = hl_mmu_scramble_vaddr,

	.scramble_addr = hl_mmu_scramble_addr,

	.descramble_addr = hl_mmu_descramble_addr,

	.ack_protection_bits_errors = goya_ack_protection_bits_errors

};