Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
cloud-kernel
提交
8b811951
cloud-kernel
项目概览
openanolis
/
cloud-kernel
1 年多 前同步成功
通知
163
Star
36
Fork
7
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
10
列表
看板
标记
里程碑
合并请求
2
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
cloud-kernel
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
10
Issue
10
列表
看板
标记
里程碑
合并请求
2
合并请求
2
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
8b811951
编写于
5月 08, 2018
作者:
B
Ben Skeggs
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
drm/nouveau/fault/gv100: initial support
Signed-off-by:
N
Ben Skeggs
<
bskeggs@redhat.com
>
上级
013b7b37
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
213 addition
and
1 deletion
+213
-1
drivers/gpu/drm/nouveau/include/nvkm/subdev/fault.h
drivers/gpu/drm/nouveau/include/nvkm/subdev/fault.h
+5
-1
drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
+1
-0
drivers/gpu/drm/nouveau/nvkm/subdev/fault/Kbuild
drivers/gpu/drm/nouveau/nvkm/subdev/fault/Kbuild
+1
-0
drivers/gpu/drm/nouveau/nvkm/subdev/fault/gv100.c
drivers/gpu/drm/nouveau/nvkm/subdev/fault/gv100.c
+206
-0
未找到文件。
drivers/gpu/drm/nouveau/include/nvkm/subdev/fault.h
浏览文件 @
8b811951
#ifndef __NVKM_FAULT_H__
#define __NVKM_FAULT_H__
#include <core/subdev.h>
#include <core/notify.h>
struct
nvkm_fault
{
const
struct
nvkm_fault_func
*
func
;
struct
nvkm_subdev
subdev
;
struct
nvkm_fault_buffer
*
buffer
[
1
];
struct
nvkm_fault_buffer
*
buffer
[
2
];
int
buffer_nr
;
struct
nvkm_event
event
;
struct
nvkm_notify
nrpfb
;
};
struct
nvkm_fault_data
{
...
...
@@ -26,4 +29,5 @@ struct nvkm_fault_data {
};
int
gp100_fault_new
(
struct
nvkm_device
*
,
int
,
struct
nvkm_fault
**
);
int
gv100_fault_new
(
struct
nvkm_device
*
,
int
,
struct
nvkm_fault
**
);
#endif
drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
浏览文件 @
8b811951
...
...
@@ -2401,6 +2401,7 @@ nv140_chipset = {
.
bios
=
nvkm_bios_new
,
.
bus
=
gf100_bus_new
,
.
devinit
=
gv100_devinit_new
,
.
fault
=
gv100_fault_new
,
.
fb
=
gv100_fb_new
,
.
fuse
=
gm107_fuse_new
,
.
gpio
=
gk104_gpio_new
,
...
...
drivers/gpu/drm/nouveau/nvkm/subdev/fault/Kbuild
浏览文件 @
8b811951
nvkm-y += nvkm/subdev/fault/base.o
nvkm-y += nvkm/subdev/fault/gp100.o
nvkm-y += nvkm/subdev/fault/gv100.o
drivers/gpu/drm/nouveau/nvkm/subdev/fault/gv100.c
0 → 100644
浏览文件 @
8b811951
/*
* Copyright 2018 Red Hat Inc.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
* OTHER DEALINGS IN THE SOFTWARE.
*/
#include "priv.h"
#include <core/memory.h>
#include <subdev/mmu.h>
#include <engine/fifo.h>
static
void
gv100_fault_buffer_process
(
struct
nvkm_fault_buffer
*
buffer
)
{
struct
nvkm_device
*
device
=
buffer
->
fault
->
subdev
.
device
;
struct
nvkm_memory
*
mem
=
buffer
->
mem
;
const
u32
foff
=
buffer
->
id
*
0x14
;
u32
get
=
nvkm_rd32
(
device
,
0x100e2c
+
foff
);
u32
put
=
nvkm_rd32
(
device
,
0x100e30
+
foff
);
if
(
put
==
get
)
return
;
nvkm_kmap
(
mem
);
while
(
get
!=
put
)
{
const
u32
base
=
get
*
buffer
->
fault
->
func
->
buffer
.
entry_size
;
const
u32
instlo
=
nvkm_ro32
(
mem
,
base
+
0x00
);
const
u32
insthi
=
nvkm_ro32
(
mem
,
base
+
0x04
);
const
u32
addrlo
=
nvkm_ro32
(
mem
,
base
+
0x08
);
const
u32
addrhi
=
nvkm_ro32
(
mem
,
base
+
0x0c
);
const
u32
timelo
=
nvkm_ro32
(
mem
,
base
+
0x10
);
const
u32
timehi
=
nvkm_ro32
(
mem
,
base
+
0x14
);
const
u32
info0
=
nvkm_ro32
(
mem
,
base
+
0x18
);
const
u32
info1
=
nvkm_ro32
(
mem
,
base
+
0x1c
);
struct
nvkm_fault_data
info
;
if
(
++
get
==
buffer
->
entries
)
get
=
0
;
nvkm_wr32
(
device
,
0x100e2c
+
foff
,
get
);
info
.
addr
=
((
u64
)
addrhi
<<
32
)
|
addrlo
;
info
.
inst
=
((
u64
)
insthi
<<
32
)
|
instlo
;
info
.
time
=
((
u64
)
timehi
<<
32
)
|
timelo
;
info
.
engine
=
(
info0
&
0x000000ff
);
info
.
valid
=
(
info1
&
0x80000000
)
>>
31
;
info
.
gpc
=
(
info1
&
0x1f000000
)
>>
24
;
info
.
hub
=
(
info1
&
0x00100000
)
>>
20
;
info
.
access
=
(
info1
&
0x000f0000
)
>>
16
;
info
.
client
=
(
info1
&
0x00007f00
)
>>
8
;
info
.
reason
=
(
info1
&
0x0000001f
);
nvkm_fifo_fault
(
device
->
fifo
,
&
info
);
}
nvkm_done
(
mem
);
}
static
void
gv100_fault_buffer_fini
(
struct
nvkm_fault_buffer
*
buffer
)
{
struct
nvkm_device
*
device
=
buffer
->
fault
->
subdev
.
device
;
const
u32
intr
=
buffer
->
id
?
0x08000000
:
0x20000000
;
const
u32
foff
=
buffer
->
id
*
0x14
;
nvkm_mask
(
device
,
0x100a34
,
intr
,
intr
);
nvkm_mask
(
device
,
0x100e34
+
foff
,
0x80000000
,
0x00000000
);
}
static
void
gv100_fault_buffer_init
(
struct
nvkm_fault_buffer
*
buffer
)
{
struct
nvkm_device
*
device
=
buffer
->
fault
->
subdev
.
device
;
const
u32
intr
=
buffer
->
id
?
0x08000000
:
0x20000000
;
const
u32
foff
=
buffer
->
id
*
0x14
;
nvkm_mask
(
device
,
0x100e34
+
foff
,
0xc0000000
,
0x40000000
);
nvkm_wr32
(
device
,
0x100e28
+
foff
,
upper_32_bits
(
buffer
->
vma
->
addr
));
nvkm_wr32
(
device
,
0x100e24
+
foff
,
lower_32_bits
(
buffer
->
vma
->
addr
));
nvkm_mask
(
device
,
0x100e34
+
foff
,
0x80000000
,
0x80000000
);
nvkm_mask
(
device
,
0x100a2c
,
intr
,
intr
);
}
static
u32
gv100_fault_buffer_entries
(
struct
nvkm_fault_buffer
*
buffer
)
{
struct
nvkm_device
*
device
=
buffer
->
fault
->
subdev
.
device
;
const
u32
foff
=
buffer
->
id
*
0x14
;
nvkm_mask
(
device
,
0x100e34
+
foff
,
0x40000000
,
0x40000000
);
return
nvkm_rd32
(
device
,
0x100e34
+
foff
)
&
0x000fffff
;
}
static
int
gv100_fault_ntfy_nrpfb
(
struct
nvkm_notify
*
notify
)
{
struct
nvkm_fault
*
fault
=
container_of
(
notify
,
typeof
(
*
fault
),
nrpfb
);
gv100_fault_buffer_process
(
fault
->
buffer
[
0
]);
return
NVKM_NOTIFY_KEEP
;
}
static
void
gv100_fault_intr_fault
(
struct
nvkm_fault
*
fault
)
{
struct
nvkm_subdev
*
subdev
=
&
fault
->
subdev
;
struct
nvkm_device
*
device
=
subdev
->
device
;
struct
nvkm_fault_data
info
;
const
u32
addrlo
=
nvkm_rd32
(
device
,
0x100e4c
);
const
u32
addrhi
=
nvkm_rd32
(
device
,
0x100e50
);
const
u32
info0
=
nvkm_rd32
(
device
,
0x100e54
);
const
u32
insthi
=
nvkm_rd32
(
device
,
0x100e58
);
const
u32
info1
=
nvkm_rd32
(
device
,
0x100e5c
);
info
.
addr
=
((
u64
)
addrhi
<<
32
)
|
addrlo
;
info
.
inst
=
((
u64
)
insthi
<<
32
)
|
(
info0
&
0xfffff000
);
info
.
time
=
0
;
info
.
engine
=
(
info0
&
0x000000ff
);
info
.
valid
=
(
info1
&
0x80000000
)
>>
31
;
info
.
gpc
=
(
info1
&
0x1f000000
)
>>
24
;
info
.
hub
=
(
info1
&
0x00100000
)
>>
20
;
info
.
access
=
(
info1
&
0x000f0000
)
>>
16
;
info
.
client
=
(
info1
&
0x00007f00
)
>>
8
;
info
.
reason
=
(
info1
&
0x0000001f
);
nvkm_fifo_fault
(
device
->
fifo
,
&
info
);
}
static
void
gv100_fault_intr
(
struct
nvkm_fault
*
fault
)
{
struct
nvkm_subdev
*
subdev
=
&
fault
->
subdev
;
struct
nvkm_device
*
device
=
subdev
->
device
;
u32
stat
=
nvkm_rd32
(
device
,
0x100a20
);
if
(
stat
&
0x80000000
)
{
gv100_fault_intr_fault
(
fault
);
nvkm_wr32
(
device
,
0x100e60
,
0x80000000
);
stat
&=
~
0x80000000
;
}
if
(
stat
&
0x20000000
)
{
if
(
fault
->
buffer
[
0
])
{
nvkm_event_send
(
&
fault
->
event
,
1
,
0
,
NULL
,
0
);
stat
&=
~
0x20000000
;
}
}
if
(
stat
)
{
nvkm_debug
(
subdev
,
"intr %08x
\n
"
,
stat
);
}
}
static
void
gv100_fault_fini
(
struct
nvkm_fault
*
fault
)
{
nvkm_notify_put
(
&
fault
->
nrpfb
);
nvkm_mask
(
fault
->
subdev
.
device
,
0x100a34
,
0x80000000
,
0x80000000
);
}
static
void
gv100_fault_init
(
struct
nvkm_fault
*
fault
)
{
nvkm_mask
(
fault
->
subdev
.
device
,
0x100a2c
,
0x80000000
,
0x80000000
);
nvkm_notify_get
(
&
fault
->
nrpfb
);
}
static
const
struct
nvkm_fault_func
gv100_fault
=
{
.
init
=
gv100_fault_init
,
.
fini
=
gv100_fault_fini
,
.
intr
=
gv100_fault_intr
,
.
buffer
.
nr
=
2
,
.
buffer
.
entry_size
=
32
,
.
buffer
.
entries
=
gv100_fault_buffer_entries
,
.
buffer
.
init
=
gv100_fault_buffer_init
,
.
buffer
.
fini
=
gv100_fault_buffer_fini
,
};
int
gv100_fault_new
(
struct
nvkm_device
*
device
,
int
index
,
struct
nvkm_fault
**
pfault
)
{
struct
nvkm_fault
*
fault
;
int
ret
;
ret
=
nvkm_fault_new_
(
&
gv100_fault
,
device
,
index
,
&
fault
);
*
pfault
=
fault
;
if
(
ret
)
return
ret
;
return
nvkm_notify_init
(
&
fault
->
buffer
[
0
]
->
object
,
&
fault
->
event
,
gv100_fault_ntfy_nrpfb
,
false
,
NULL
,
0
,
0
,
&
fault
->
nrpfb
);
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录