drm/xe: Make xe_mem_region struct
Subsystems (2)
PATCH 1/2 drm/xe: Make xe_mem_region struct
Make a xe_mem_region structure which will be used in the coming patches. The new structure is used in both xe device level (xe->mem.vram) and xe_tile level (tile->vram).
Make the definition of xe_mem_region.dpa_base to be the DPA base of this memory region and change codes according to this new definition.
v1:
- rename xe_mem_region.base to dpa_base per conversation with Mike Ruhl
--- drivers/gpu/drm/xe/xe_bo.c | 2 +- drivers/gpu/drm/xe/xe_device_types.h | 94 ++++++++++++---------------- drivers/gpu/drm/xe/xe_migrate.c | 2 +- drivers/gpu/drm/xe/xe_mmio.c | 9 +-- 4 files changed, 47 insertions(+), 60 deletions(-)
drivers/gpu/drm/xe/xe_bo.c +1 -1
@@ -1457,7 +1457,7 @@ uint64_t vram_region_gpu_offset(struct ttm_resource *res)if (res->mem_type ==XE_PL_STOLEN )return xe_ttm_stolen_gpu_offset (xe); -return xe->mem.vram.base + tile->mem.vram.base; +return tile->mem.vram.dpa_base; }/**
drivers/gpu/drm/xe/xe_device_types.h +40 -54
112 lines not on this page · raw message
drivers/gpu/drm/xe/xe_migrate.c +1 -1
@@ -264,7 +264,7 @@ static int xe_migrate_prepare_vm(struct xe_tile *tile, struct xe_migrate *m,* Use 1GB pages, it shouldn't matter the physical amount of * vram is less, when we don't access it. */ -for (pos =0 ; pos < xe->mem.vram.size; pos +=SZ_1G , ofs +=8 ) +for (pos =0 ; pos < xe->mem.vram.actual_physical_size; pos +=SZ_1G , ofs +=8 )xe_map_wr (xe, &bo->vmap, ofs, u64, pos | flags); }
drivers/gpu/drm/xe/xe_mmio.c +5 -4
@@ -173,7 +173,8 @@ static int xe_determine_lmem_bar_size(struct xe_device *xe)if (!xe->mem.vram.io_size)return -EIO ; - xe->mem.vram.base =0 ;/* DPA offset */ +/* XXX: Need to change when xe link code is ready */ + xe->mem.vram.dpa_base =0 ;/* set up a map to the total memory area. */ xe->mem.vram.mapping =ioremap_wc (xe->mem.vram.io_start, xe->mem.vram.io_size);
@@ -281,7 +282,7 @@ int xe_mmio_probe_vram(struct xe_device *xe)return -ENODEV ; } - tile->mem.vram.base = tile_offset; + tile->mem.vram.dpa_base = xe->mem.vram.dpa_base + tile_offset; tile->mem.vram.usable_size = vram_size; tile->mem.vram.mapping = xe->mem.vram.mapping + tile_offset;
@@ -304,10 +305,10 @@ int xe_mmio_probe_vram(struct xe_device *xe) io_size -=min_t (u64, tile_size, io_size); } - xe->mem.vram.size = total_size; + xe->mem.vram.actual_physical_size = total_size;drm_info (&xe->drm,"Total VRAM: %pa, %pa\n" , &xe->mem.vram.io_start, - &xe->mem.vram.size); + &xe->mem.vram.actual_physical_size);drm_info (&xe->drm,"Available VRAM: %pa, %pa\n" , &xe->mem.vram.io_start, &available_size);
Signature · 1 line
2.26.3
PATCH 2/2 drm/xe: Improve vram info debug printing
Print both device physical address range and CPU io range of vram. Also print vram's actual size, usable size excluding stolen memory, and CPU io accessible size.
--- drivers/gpu/drm/xe/xe_mmio.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/gpu/drm/xe/xe_mmio.c +5 -5
@@ -286,12 +286,12 @@ int xe_mmio_probe_vram(struct xe_device *xe) tile->mem.vram.usable_size = vram_size; tile->mem.vram.mapping = xe->mem.vram.mapping + tile_offset; -drm_info (&xe->drm,"VRAM[%u, %u]: %pa, %pa\n" , id, tile->id, - &tile->mem.vram.io_start, &tile->mem.vram.usable_size); +drm_info (&xe->drm,"VRAM[%u, %u]: Actual physical size %pa, usable size exclude stolen %pa, CPU accessible size %pa\n" , id, + tile->id, &tile->mem.vram.actual_physical_size, &tile->mem.vram.usable_size, &tile->mem.vram.io_size); -if (tile->mem.vram.io_size < tile->mem.vram.usable_size) -drm_info (&xe->drm,"VRAM[%u, %u]: CPU access limited to %pa\n" , id, - tile->id, &tile->mem.vram.io_size); +drm_info (&xe->drm,"VRAM[%u, %u]: DPA range: [%pa-%llx], io range: [%pa-%llx]\n" , id, tile->id, + &tile->mem.vram.dpa_base, tile->mem.vram.dpa_base + tile->mem.vram.actual_physical_size, + &tile->mem.vram.io_start, tile->mem.vram.io_start + tile->mem.vram.io_size);/* calculate total size using tile size to get the correct HW sizing */ total_size += tile_size;
Signature · 1 line
2.26.3
Quoted 13 lines
-----Original Message-----
From: Zeng, Oak <[email protected]>
Sent: Thursday, August 10, 2023 12:08 PM
To: [email protected]
Cc: Ruhl, Michael J <[email protected]>; Brost, Matthew <[email protected]>
Subject: [PATCH 1/2] drm/xe: Makexe_mem_regionstructMake a
xe_mem_regionstructure which will be used in the coming patches. The new structure is used in both xe device level (xe->mem.vram) andxe_tilelevel (tile->vram).
Quoted 7 lines
Make the definition of xe_mem_region.dpa_base to be the DPA base of this memory region and change codes according to this new definition.
v1:
- rename xe_mem_region.base todpa_baseper conversation with Mike Ruhl
This looks good to me.
For the series:
M
Quoted 210 lines
Signed-off-by Oak Zeng <[email protected]>---
drivers/gpu/drm/xe/xe_bo.c | 2 +- drivers/gpu/drm/xe/xe_device_types.h | 94 ++++++++++++---------------- drivers/gpu/drm/xe/xe_migrate.c | 2 +- drivers/gpu/drm/xe/xe_mmio.c | 9 +-- 4 files changed, 47 insertions(+), 60 deletions(-)drivers/gpu/drm/xe/xe_bo.c +1
-1@@ -1457,7 +1457,7 @@ uint64_t vram_region_gpu_offset(struct ttm_resource *res)if (res->mem_type ==XE_PL_STOLEN )return xe_ttm_stolen_gpu_offset (xe); -return xe->mem.vram.base + tile->mem.vram.base; +return tile->mem.vram.dpa_base; }/**
drivers/gpu/drm/xe/xe_device_types.h +38
-0@@ -56,6 +56,44 @@ struct xe_ggtt; const struct xe_tile * : (const struct xe_device *)((tile__)- >xe), \ struct xe_tile * : (tile__)->xe) +/** +* struct xe_mem_region - memory region structure +* This is used to describe a memory region in xe +* device, such as HBM memory or CXL extension memory. +*/ +struct xe_mem_region { +/** @io_start: IO start address of this VRAM instance */ +resource_size_t io_start; +/** +* @io_size: IO size of this VRAM instance +* +* This represents how much of this VRAM we can access +* via the CPU through the VRAM BAR. This can be smaller +* than @usable_size, in which case only part of VRAM is CPU +* accessible (typically the first 256M). This +* configuration is known as small-bar. +*/ +resource_size_t io_size; +/** @base: This memory regions's DPA (device physical address) base */ +resource_size_t dpa_base; +/** +* @usable_size: usable size of VRAM +* +* Usable size of VRAM excluding reserved portions +* (e.g stolen mem) +*/ +resource_size_t usable_size; +/** +* @actual_physical_size: Actual VRAM size +* +* Actual VRAM size including reserved portions +* (e.g stolen mem) +*/ +resource_size_t actual_physical_size; +/** @mapping: pointer to VRAM mappable space */ +void *__iomem mapping; +}; +/** * struct
xe_tile- hardware tile structure
*drivers/gpu/drm/xe/xe_device_types.h +0
-7@@ -113,38 +151,7 @@ struct xe_tile {* Although VRAM is associated with a specific tile, it can * still be accessed by all tiles' GTs. */ -struct { -/** @io_start: IO start address of this VRAM instance */ -resource_size_t io_start; -/** -* @io_size: IO size of this VRAM instance -* -* This represents how much of this VRAM we can access
drivers/gpu/drm/xe/xe_device_types.h +0
-1-* via the CPU through the VRAM BAR. This can be smaller
drivers/gpu/drm/xe/xe_device_types.h +1
-24-* than @size, in which case only part of VRAM is CPU -* accessible (typically the first 256M). This -* configuration is known as small-bar. -*/ -resource_size_t io_size; -/** @base: offset of VRAM starting base */ -resource_size_t base; -/** -* @usable_size: usable size of VRAM -* -* Usable size of VRAM excluding reserved portions -* (e.g stolen mem) -*/ -resource_size_t usable_size; -/** -* @actual_physical_size: Actual VRAM size -* -* Actual VRAM size including reserved portions -* (e.g stolen mem) -*/ -resource_size_t actual_physical_size; -/** @mapping: pointer to VRAM mappable space */ -void *__iomem mapping; - } vram; +struct xe_mem_region vram;/** @vram_mgr: VRAM TTM manager */ struct xe_ttm_vram_mgr *vram_mgr;drivers/gpu/drm/xe/xe_device_types.h +0
-7@@ -263,28 +270,7 @@ struct xe_device {/** @mem: memory info for device */ struct {/** @vram: VRAM info for device */ -struct { -/** @io_start: IO start address of VRAM */ -resource_size_t io_start; -/** -* @io_size: IO size of VRAM. -* -* This represents how much of VRAM the CPU can access
drivers/gpu/drm/xe/xe_device_types.h +0
-11-* via the VRAM BAR. -* On systems that do not support large BAR IO space, -* this can be smaller than the actual memory size, in -* which case only part of VRAM is CPU accessible -* (typically the first 256M). This configuration is -* known as small-bar. -*/ -resource_size_t io_size; -/** @size: Total size of VRAM */ -resource_size_t size; -/** @base: Offset to apply for Device Physical Address control */
drivers/gpu/drm/xe/xe_device_types.h +1
-4-resource_size_t base; -/** @mapping: pointer to VRAM mappable space */ -void *__iomem mapping; - } vram; +struct xe_mem_region vram;/** @sys_mgr: system TTM manager */ struct ttm_resource_manager sys_mgr; } mem;drivers/gpu/drm/xe/xe_migrate.c +2
-1@@ -264,7 +264,7 @@ static int xe_migrate_prepare_vm(struct xe_tile *tile,struct xe_migrate *m, * Use 1GB pages, it shouldn't matter the physical amount of * vram is less, when we don't access it. */ -for (pos =0 ; pos < xe->mem.vram.size; pos +=SZ_1G , ofs += 8) +for (pos =0 ; pos < xe->mem.vram.actual_physical_size; pos +=SZ_1G , ofs +=8 )xe_map_wr(xe, &bo->vmap, ofs, u64, pos | flags); }drivers/gpu/drm/xe/xe_mmio.c +2
-1@@ -173,7 +173,8 @@ static int xe_determine_lmem_bar_size(struct xe_device *xe)if (!xe->mem.vram.io_size)return -EIO ; - xe->mem.vram.base =0 ;/* DPA offset */ +/* XXX: Need to change when xe link code is ready */ + xe->mem.vram.dpa_base =0 ;/* set up a map to the total memory area. */ xe->mem.vram.mapping = ioremap_wc(xe->mem.vram.io_start, xe-Quoted 1 line
mem.vram.io_size);
drivers/gpu/drm/xe/xe_mmio.c +1
-1@@ -281,7 +282,7 @@ int xe_mmio_probe_vram(struct xe_device *xe)return -ENODEV ; } - tile->mem.vram.base = tile_offset; + tile->mem.vram.dpa_base = xe->mem.vram.dpa_base + tile_offset; tile->mem.vram.usable_size = vram_size; tile->mem.vram.mapping = xe->mem.vram.mapping +
tile_offset;drivers/gpu/drm/xe/xe_mmio.c +2
-2@@ -304,10 +305,10 @@ int xe_mmio_probe_vram(struct xe_device *xe) io_size -=min_t (u64, tile_size, io_size); } - xe->mem.vram.size = total_size; + xe->mem.vram.actual_physical_size = total_size;drm_info (&xe->drm,"Total VRAM: %pa, %pa\n" , &xe- >mem.vram.io_start, - &xe->mem.vram.size); + &xe->mem.vram.actual_physical_size); drm_info(&xe->drm, "Available VRAM: %pa, %pa\n", &xe- >mem.vram.io_start,&available_size);--
2.26.3
Quoted 8 lines · Oak Zeng
Make a
xe_mem_regionstructure which will be used in the coming patches. The new structure is used in both xe device level (xe->mem.vram) andxe_tilelevel (tile->vram).Make the definition of xe_mem_region.dpa_base to be the DPA base of this memory region and change codes according to this new definition.
Quoted 5 lines
v1:
- rename xe_mem_region.base todpa_baseper conversation with Mike RuhlSigned-off-by Oak Zeng <[email protected]>
Quoted 191 lines
--- drivers/gpu/drm/xe/xe_bo.c | 2 +- drivers/gpu/drm/xe/xe_device_types.h | 94 ++++++++++++---------------- drivers/gpu/drm/xe/xe_migrate.c | 2 +- drivers/gpu/drm/xe/xe_mmio.c | 9 +-- 4 files changed, 47 insertions(+), 60 deletions(-)drivers/gpu/drm/xe/xe_bo.c +1
-1@@ -1457,7 +1457,7 @@ uint64_t vram_region_gpu_offset(struct ttm_resource *res)if (res->mem_type ==XE_PL_STOLEN )return xe_ttm_stolen_gpu_offset (xe); -return xe->mem.vram.base + tile->mem.vram.base; +return tile->mem.vram.dpa_base; }/** drivers/gpu/drm/xe/xe_device_types.h +40
-54@@ -56,6 +56,44 @@ struct xe_ggtt; const struct xe_tile * : (const struct xe_device *)((tile__)->xe), \ struct xe_tile * : (tile__)->xe) +/** +* struct xe_mem_region - memory region structure +* This is used to describe a memory region in xe +* device, such as HBM memory or CXL extension memory. +*/ +struct xe_mem_region { +/** @io_start: IO start address of this VRAM instance */ +resource_size_t io_start; +/** +* @io_size: IO size of this VRAM instance +* +* This represents how much of this VRAM we can access +* via the CPU through the VRAM BAR. This can be smaller +* than @usable_size, in which case only part of VRAM is CPU +* accessible (typically the first 256M). This +* configuration is known as small-bar. +*/ +resource_size_t io_size; +/** @base: This memory regions's DPA (device physical address) base */ +resource_size_t dpa_base; +/** +* @usable_size: usable size of VRAM +* +* Usable size of VRAM excluding reserved portions +* (e.g stolen mem) +*/ +resource_size_t usable_size; +/** +* @actual_physical_size: Actual VRAM size +* +* Actual VRAM size including reserved portions +* (e.g stolen mem) +*/ +resource_size_t actual_physical_size; +/** @mapping: pointer to VRAM mappable space */ +void *__iomem mapping; +}; +/** * struct xe_tile - hardware tile structure * @@ -113,38 +151,7 @@ struct xe_tile {* Although VRAM is associated with a specific tile, it can * still be accessed by all tiles' GTs. */ -struct { -/** @io_start: IO start address of this VRAM instance */ -resource_size_t io_start; -/** -* @io_size: IO size of this VRAM instance -* -* This represents how much of this VRAM we can access -* via the CPU through the VRAM BAR. This can be smaller -* than @size, in which case only part of VRAM is CPU -* accessible (typically the first 256M). This -* configuration is known as small-bar. -*/ -resource_size_t io_size; -/** @base: offset of VRAM starting base */ -resource_size_t base; -/** -* @usable_size: usable size of VRAM -* -* Usable size of VRAM excluding reserved portions -* (e.g stolen mem) -*/ -resource_size_t usable_size; -/** -* @actual_physical_size: Actual VRAM size -* -* Actual VRAM size including reserved portions -* (e.g stolen mem) -*/ -resource_size_t actual_physical_size; -/** @mapping: pointer to VRAM mappable space */ -void *__iomem mapping; - } vram; +struct xe_mem_region vram;/** @vram_mgr: VRAM TTM manager */ struct xe_ttm_vram_mgr *vram_mgr;@@ -263,28 +270,7 @@ struct xe_device {/** @mem: memory info for device */ struct {/** @vram: VRAM info for device */ -struct { -/** @io_start: IO start address of VRAM */ -resource_size_t io_start; -/** -* @io_size: IO size of VRAM. -* -* This represents how much of VRAM the CPU can access -* via the VRAM BAR. -* On systems that do not support large BAR IO space, -* this can be smaller than the actual memory size, in -* which case only part of VRAM is CPU accessible -* (typically the first 256M). This configuration is -* known as small-bar. -*/ -resource_size_t io_size; -/** @size: Total size of VRAM */ -resource_size_t size; -/** @base: Offset to apply for Device Physical Address control */ -resource_size_t base; -/** @mapping: pointer to VRAM mappable space */ -void *__iomem mapping; - } vram; +struct xe_mem_region vram;/** @sys_mgr: system TTM manager */ struct ttm_resource_manager sys_mgr; } mem;drivers/gpu/drm/xe/xe_migrate.c +1
-1@@ -264,7 +264,7 @@ static int xe_migrate_prepare_vm(struct xe_tile *tile, struct xe_migrate *m,* Use 1GB pages, it shouldn't matter the physical amount of * vram is less, when we don't access it. */ -for (pos =0 ; pos < xe->mem.vram.size; pos +=SZ_1G , ofs +=8 ) +for (pos =0 ; pos < xe->mem.vram.actual_physical_size; pos +=SZ_1G , ofs +=8 )xe_map_wr (xe, &bo->vmap, ofs, u64, pos | flags); }drivers/gpu/drm/xe/xe_mmio.c +5
-4@@ -173,7 +173,8 @@ static int xe_determine_lmem_bar_size(struct xe_device *xe)if (!xe->mem.vram.io_size)return -EIO ; - xe->mem.vram.base =0 ;/* DPA offset */ +/* XXX: Need to change when xe link code is ready */ + xe->mem.vram.dpa_base =0 ;/* set up a map to the total memory area. */ xe->mem.vram.mapping =ioremap_wc (xe->mem.vram.io_start, xe->mem.vram.io_size);@@ -281,7 +282,7 @@ int xe_mmio_probe_vram(struct xe_device *xe)return -ENODEV ; } - tile->mem.vram.base = tile_offset; + tile->mem.vram.dpa_base = xe->mem.vram.dpa_base + tile_offset; tile->mem.vram.usable_size = vram_size; tile->mem.vram.mapping = xe->mem.vram.mapping + tile_offset;@@ -304,10 +305,10 @@ int xe_mmio_probe_vram(struct xe_device *xe) io_size -=min_t (u64, tile_size, io_size); } - xe->mem.vram.size = total_size; + xe->mem.vram.actual_physical_size = total_size;drm_info (&xe->drm,"Total VRAM: %pa, %pa\n" , &xe->mem.vram.io_start, - &xe->mem.vram.size); + &xe->mem.vram.actual_physical_size);drm_info (&xe->drm,"Available VRAM: %pa, %pa\n" , &xe->mem.vram.io_start, &available_size);Signature · 1 line
2.26.3