Commits · ebe52a58acca308142ba2811e50a1b3bf047240d · nexedi / linux

15 Jan, 2020 40 commits

drm/nouveau/fb/gp102-: unlock VPR as part of FB init · ebe52a58

Ben Skeggs authored Jan 15, 2020

We perform memory allocations long before we hit the code in SECBOOT that
would unlock the VPR, which could potentially result in memory allocation
within the locked region.

Run the scrubber binary right after VRAM init to ensure we don't.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

ebe52a58

drm/nouveau/core/memory: add macros to read/write blocks from objects · ff213b63
Ben Skeggs authored Jan 15, 2020
```
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
```
ff213b63
drm/nouveau/secboot: move code to boot LS falcons to subdevs · 7a4dde71
Ben Skeggs authored Jan 15, 2020
```
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
```
7a4dde71
drm/nouveau/flcn/msgq: rename msgq-related nvkm_msgqueue_queue to nvkm_falcon_msgq · 91a4e83a
Ben Skeggs authored Jan 15, 2020
```
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
```
91a4e83a
drm/nouveau/flcn/msgq: pass explicit message queue pointer to recv() · e1cc5798
Ben Skeggs authored Jan 15, 2020
```
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
```
e1cc5798

drm/nouveau/flcn/msgq: move handling of init message to subdevs · d114a139

Ben Skeggs authored Jan 15, 2020

When the PMU/SEC2 LS FWs have booted, they'll send a message to the host
with various information, including the configuration of message/command
queues that are available.

Move the handling for this to the relevant subdevs.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

d114a139

drm/nouveau/flcn/msgq: drop nvkm_msgqueue argument to functions · 2d063981
Ben Skeggs authored Jan 15, 2020
```
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
```
2d063981
drm/nouveau/flcn/msgq: switch to falcon queue printk macros · 77b1ab61
Ben Skeggs authored Jan 15, 2020
```
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
```
77b1ab61

drm/nouveau/flcn/msgq: simplify msg_queue_pop() error handling · e9602a1b

Ben Skeggs authored Jan 15, 2020

We always want at least requested size, make anything less a more direct
error condition.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

e9602a1b

drm/nouveau/flcn/msgq: remove error handling for msg_queue_open(), it can't fail · f09a3ee3
Ben Skeggs authored Jan 15, 2020
```
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
```
f09a3ee3

drm/nouveau/flcn/cmdq: move command generation to subdevs · 86ce2a71

Ben Skeggs authored Jan 15, 2020

This moves the code to generate commands for the ACR unit of the PMU/SEC2 LS
firmwares to those subdevs.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

86ce2a71

drm/nouveau/flcn/cmdq: rename cmdq-related nvkm_msqqueue_queue to nvkm_falcon_cmdq · 25fd061c
Ben Skeggs authored Jan 15, 2020
```
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
```
25fd061c

drm/nouveau/flcn/cmdq: implement a more explicit send() interface · 14974525

Ben Skeggs authored Jan 15, 2020

Takes the command queue pointer directly instead of requiring a function to
lookup based on an queue type, as well as an explicit timeout value.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

14974525

drm/nouveau/flcn/cmdq: drop nvkm_msgqueue argument to functions · 2b287aeb
Ben Skeggs authored Jan 15, 2020
```
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
```
2b287aeb
drm/nouveau/flcn/cmdq: switch to falcon queue printk macros · baafecbf
Ben Skeggs authored Jan 15, 2020
```
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
```
baafecbf
drm/nouveau/flcn/cmdq: cmd_queue_close always commits, simplify it · c2c9b243
Ben Skeggs authored Jan 15, 2020
```
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
```
c2c9b243
drm/nouveau/flcn/cmdq: cmd_queue_push can't fail, remove error handling for it · 2baaffff
Ben Skeggs authored Jan 15, 2020
```
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
```
2baaffff

drm/nouveau/flcn/cmdq: split the condition for queue readiness vs pmu acr readiness · 2e8a6597

Ben Skeggs authored Jan 15, 2020

This is to allow for proper separation of the LS interface code from the
queue handling code.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

2e8a6597

drm/nouveau/flcn/qmgr: rename remaining nvkm_msgqueue bits to nvkm_falcon_qmgr · a15d8f58
Ben Skeggs authored Jan 15, 2020
```
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
```
a15d8f58

drm/nouveau/flcn/qmgr: support syncronous command submission from common code · 8e90a98d

Ben Skeggs authored Jan 15, 2020

Functions implementing FW commands had to implement this themselves, let's
move that to common code and plumb the return code from callbacks through.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

8e90a98d

drm/nouveau/flcn/qmgr: allow arbtrary priv + return code for callbacks · c80157a2

Ben Skeggs authored Jan 15, 2020

Code to interface with LS firmwares is being moved to the subdevs where it
belongs, rather than living in the common falcon code.

Arbitrary private data passed to callbacks is to allow for something other
than struct nvkm_msgqueue to be passed into the callback (like the pointer
to the subdev itself, for example), and the return code will be used where
we'd like to detect failure from synchronous messages.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

c80157a2

drm/nouveau/flcn/qmgr: move sequence tracking from nvkm_msgqueue to nvkm_falcon_qmgr · 0ae59432
Ben Skeggs authored Jan 15, 2020
```
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
```
0ae59432

drm/nouveau/flcn/msgq: explicitly create message queue from subdevs · 22431189

Ben Skeggs authored Jan 15, 2020

Code to interface with LS firmwares is being moved to the subdevs where it
belongs, rather than living in the common falcon code.

This is an incremental step towards that goal.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

22431189

drm/nouveau/flcn/cmdq: explicitly create command queue(s) from subdevs · acc466ab

Ben Skeggs authored Jan 15, 2020

Code to interface with LS firmwares is being moved to the subdevs where it
belongs, rather than living in the common falcon code.

This is an incremental step towards that goal.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

acc466ab

drm/nouveau/flcn/qmgr: explicitly create queue manager from subdevs · 8763955b

Ben Skeggs authored Jan 15, 2020

Code to interface with LS firmwares is being moved to the subdevs where it
belongs, rather than living in the common falcon code.

This is an incremental step towards that goal.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

8763955b

drm/nouveau/flcn: split msgqueue into multiple pieces · 7e1659cc

Ben Skeggs authored Jan 15, 2020

To make things clearer while modifying the interfaces, split msgqueue into
Queue Manager, Command Queue, and Message Queue.

There should be no code changes here, these will be done incrementally.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

7e1659cc

drm/nouveau/flcn: add printk macros · 3d0482ec
Ben Skeggs authored Jan 15, 2020
```
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
```
3d0482ec
drm/nouveau/flcn: reset sec2/gsp falcons harder · af696a61
Ben Skeggs authored Jan 15, 2020
```
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
```
af696a61

drm/nouveau/flcn: specify queue register offsets from subdev · b826f48a

Ben Skeggs authored Jan 15, 2020

Also fixes the values for Turing, even though we don't use it yet.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

b826f48a

drm/nouveau/flcn: specify debug/production register offset from subdev · e938c4e7
Ben Skeggs authored Jan 15, 2020
```
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
```
e938c4e7
drm/nouveau/flcn: specify EMEM address from subdev · bc3cfd18
Ben Skeggs authored Jan 15, 2020
```
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
```
bc3cfd18
drm/nouveau/flcn: move bind_context WAR out of common code · ca3190e3
Ben Skeggs authored Jan 15, 2020
```
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
```
ca3190e3
drm/nouveau/flcn: specify FBIF offset from subdev · fb0a5bbe
Ben Skeggs authored Jan 15, 2020
```
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
```
fb0a5bbe
drm/nouveau/nvenc: add a stub implementation for the GPUs where it should be supported · 10e43bfd
Ben Skeggs authored Jan 15, 2020
```
Mostly so we don't lose info hidden in falcon.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
```
10e43bfd
drm/nouveau/nvdec/gm107-: add missing engine instances · a5482b9f
Ben Skeggs authored Jan 15, 2020
```
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
```
a5482b9f

drm/nouveau/nvdec/gm107: rename from gp102 implementation · 68f02444

Ben Skeggs authored Jan 15, 2020

NVDEC is available from GM107, and we currently only have a stub
implementation anyway, let's make it explicit.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

68f02444

drm/nouveau/nvdec: initialise SW state for falcon from constructor · 3a900a5d

Ben Skeggs authored Jan 15, 2020

This will allow us to register the falcon with ACR, and further customise
its behaviour by providing the nvkm_falcon_func structure directly.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

3a900a5d

drm/nouveau/nvdec: select implementation based on available fw · 98a34d99

Ben Skeggs authored Jan 15, 2020

This will allow for further customisation of the subdev depending on what
firmware is available.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

98a34d99

drm/nouveau/sec2: move interrupt handler to hw-specific module · c9af47bc
Ben Skeggs authored Jan 15, 2020
```
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
```
c9af47bc
drm/nouveau/sec2: use falcon funcs · 555a0002
Ben Skeggs authored Jan 15, 2020
```
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
```
555a0002