Commit b5977643 authored by Ben Skeggs's avatar Ben Skeggs

drm/nouveau/mmu/gk104,gk20a: implement new vmm backend

Adds support for:
- 64KiB big page size.
- System-memory PTs.
- LPTE "invalid" state.
- (Tegra) Use of video memory aperture.

Adds support for marking LPTEs invalid, resulting in the corresponding
SPTEs being ignored, which is supposed to speed up TLB invalidates.

On The Tegra side, this will switch to using the video memory aperture
for all mappings.  The HW will still target non-coherent system memory,
but this aperture needs to be selected in order to support compression.

Tegra's instmem backend somewhat cheated to get this effect previously.
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent b77791da
...@@ -30,12 +30,8 @@ gk104_mmu = { ...@@ -30,12 +30,8 @@ gk104_mmu = {
.pgt_bits = 27 - 12, .pgt_bits = 27 - 12,
.spg_shift = 12, .spg_shift = 12,
.lpg_shift = 17, .lpg_shift = 17,
.map_pgt = gf100_vm_map_pgt,
.map = gf100_vm_map,
.map_sg = gf100_vm_map_sg,
.unmap = gf100_vm_unmap,
.flush = gf100_vm_flush,
.vmm = {{ -1, -1, NVIF_CLASS_VMM_GF100}, gk104_vmm_new }, .vmm = {{ -1, -1, NVIF_CLASS_VMM_GF100}, gk104_vmm_new },
.kind = gf100_mmu_kind,
}; };
int int
......
...@@ -30,12 +30,8 @@ gk20a_mmu = { ...@@ -30,12 +30,8 @@ gk20a_mmu = {
.pgt_bits = 27 - 12, .pgt_bits = 27 - 12,
.spg_shift = 12, .spg_shift = 12,
.lpg_shift = 17, .lpg_shift = 17,
.map_pgt = gf100_vm_map_pgt,
.map = gf100_vm_map,
.map_sg = gf100_vm_map_sg,
.unmap = gf100_vm_unmap,
.flush = gf100_vm_flush,
.vmm = {{ -1, -1, NVIF_CLASS_VMM_GF100}, gk20a_vmm_new }, .vmm = {{ -1, -1, NVIF_CLASS_VMM_GF100}, gk20a_vmm_new },
.kind = gf100_mmu_kind,
}; };
int int
......
...@@ -80,6 +80,8 @@ void gf100_vmm_pgt_dma(struct nvkm_vmm *, struct nvkm_mmu_pt *, u32, u32, ...@@ -80,6 +80,8 @@ void gf100_vmm_pgt_dma(struct nvkm_vmm *, struct nvkm_mmu_pt *, u32, u32,
void gf100_vmm_pgt_sgl(struct nvkm_vmm *, struct nvkm_mmu_pt *, u32, u32, void gf100_vmm_pgt_sgl(struct nvkm_vmm *, struct nvkm_mmu_pt *, u32, u32,
struct nvkm_vmm_map *); struct nvkm_vmm_map *);
void gk104_vmm_lpt_invalid(struct nvkm_vmm *, struct nvkm_mmu_pt *, u32, u32);
struct nvkm_vmm_desc { struct nvkm_vmm_desc {
enum { enum {
PGD, PGD,
...@@ -178,6 +180,8 @@ int gf100_vmm_valid(struct nvkm_vmm *, void *, u32, struct nvkm_vmm_map *); ...@@ -178,6 +180,8 @@ int gf100_vmm_valid(struct nvkm_vmm *, void *, u32, struct nvkm_vmm_map *);
void gf100_vmm_flush_(struct nvkm_vmm *, int); void gf100_vmm_flush_(struct nvkm_vmm *, int);
void gf100_vmm_flush(struct nvkm_vmm *, int); void gf100_vmm_flush(struct nvkm_vmm *, int);
int gk20a_vmm_aper(enum nvkm_memory_target);
int gm200_vmm_new_(const struct nvkm_vmm_func *, const struct nvkm_vmm_func *, int gm200_vmm_new_(const struct nvkm_vmm_func *, const struct nvkm_vmm_func *,
struct nvkm_mmu *, u64, u64, void *, u32, struct nvkm_mmu *, u64, u64, void *, u32,
struct lock_class_key *, const char *, struct nvkm_vmm **); struct lock_class_key *, const char *, struct nvkm_vmm **);
......
...@@ -21,8 +21,19 @@ ...@@ -21,8 +21,19 @@
*/ */
#include "vmm.h" #include "vmm.h"
void
gk104_vmm_lpt_invalid(struct nvkm_vmm *vmm,
struct nvkm_mmu_pt *pt, u32 ptei, u32 ptes)
{
/* VALID_FALSE + PRIV tells the MMU to ignore corresponding SPTEs. */
VMM_FO064(pt, vmm, ptei * 8, BIT_ULL(1) /* PRIV. */, ptes);
}
static const struct nvkm_vmm_desc_func static const struct nvkm_vmm_desc_func
gk104_vmm_lpt = { gk104_vmm_lpt = {
.invalid = gk104_vmm_lpt_invalid,
.unmap = gf100_vmm_pgt_unmap,
.mem = gf100_vmm_pgt_mem,
}; };
const struct nvkm_vmm_desc const struct nvkm_vmm_desc
...@@ -57,6 +68,9 @@ static const struct nvkm_vmm_func ...@@ -57,6 +68,9 @@ static const struct nvkm_vmm_func
gk104_vmm_17 = { gk104_vmm_17 = {
.join = gf100_vmm_join, .join = gf100_vmm_join,
.part = gf100_vmm_part, .part = gf100_vmm_part,
.aper = gf100_vmm_aper,
.valid = gf100_vmm_valid,
.flush = gf100_vmm_flush,
.page = { .page = {
{ 17, &gk104_vmm_desc_17_17[0], NVKM_VMM_PAGE_xVxC }, { 17, &gk104_vmm_desc_17_17[0], NVKM_VMM_PAGE_xVxC },
{ 12, &gk104_vmm_desc_17_12[0], NVKM_VMM_PAGE_xVHx }, { 12, &gk104_vmm_desc_17_12[0], NVKM_VMM_PAGE_xVHx },
...@@ -68,6 +82,9 @@ static const struct nvkm_vmm_func ...@@ -68,6 +82,9 @@ static const struct nvkm_vmm_func
gk104_vmm_16 = { gk104_vmm_16 = {
.join = gf100_vmm_join, .join = gf100_vmm_join,
.part = gf100_vmm_part, .part = gf100_vmm_part,
.aper = gf100_vmm_aper,
.valid = gf100_vmm_valid,
.flush = gf100_vmm_flush,
.page = { .page = {
{ 16, &gk104_vmm_desc_16_16[0], NVKM_VMM_PAGE_xVxC }, { 16, &gk104_vmm_desc_16_16[0], NVKM_VMM_PAGE_xVxC },
{ 12, &gk104_vmm_desc_16_12[0], NVKM_VMM_PAGE_xVHx }, { 12, &gk104_vmm_desc_16_12[0], NVKM_VMM_PAGE_xVHx },
......
...@@ -21,10 +21,25 @@ ...@@ -21,10 +21,25 @@
*/ */
#include "vmm.h" #include "vmm.h"
#include <core/memory.h>
int
gk20a_vmm_aper(enum nvkm_memory_target target)
{
switch (target) {
case NVKM_MEM_TARGET_NCOH: return 0;
default:
return -EINVAL;
}
}
static const struct nvkm_vmm_func static const struct nvkm_vmm_func
gk20a_vmm_17 = { gk20a_vmm_17 = {
.join = gf100_vmm_join, .join = gf100_vmm_join,
.part = gf100_vmm_part, .part = gf100_vmm_part,
.aper = gf100_vmm_aper,
.valid = gf100_vmm_valid,
.flush = gf100_vmm_flush,
.page = { .page = {
{ 17, &gk104_vmm_desc_17_17[0], NVKM_VMM_PAGE_xxHC }, { 17, &gk104_vmm_desc_17_17[0], NVKM_VMM_PAGE_xxHC },
{ 12, &gk104_vmm_desc_17_12[0], NVKM_VMM_PAGE_xxHx }, { 12, &gk104_vmm_desc_17_12[0], NVKM_VMM_PAGE_xxHx },
...@@ -36,6 +51,9 @@ static const struct nvkm_vmm_func ...@@ -36,6 +51,9 @@ static const struct nvkm_vmm_func
gk20a_vmm_16 = { gk20a_vmm_16 = {
.join = gf100_vmm_join, .join = gf100_vmm_join,
.part = gf100_vmm_part, .part = gf100_vmm_part,
.aper = gf100_vmm_aper,
.valid = gf100_vmm_valid,
.flush = gf100_vmm_flush,
.page = { .page = {
{ 16, &gk104_vmm_desc_16_16[0], NVKM_VMM_PAGE_xxHC }, { 16, &gk104_vmm_desc_16_16[0], NVKM_VMM_PAGE_xxHC },
{ 12, &gk104_vmm_desc_16_12[0], NVKM_VMM_PAGE_xxHx }, { 12, &gk104_vmm_desc_16_12[0], NVKM_VMM_PAGE_xxHx },
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment