Skip to content
Browse files

PCRYPT -> PCRYPT2/PCRYPT3

  • Loading branch information...
1 parent db8369b commit be1c2611a1b614a6b649e258c4250b6e1c140475 @koriakin koriakin committed Sep 4, 2013
View
15 hwdocs/bus/pmc.txt
@@ -186,13 +186,14 @@ On NV04:NV50, the bits are:
On NV50:NVC0, the bits are:
0: ??? - alleged to be related to I2C
- 1: VPE [vdec/vpe/intro.txt] [NV50:NV98 and NVA0]
+ 1: VPE [vdec/vpe/intro.txt] [NV50:NV98 NVA0:NVAA]
1: PPPP [vdec/vp3/pppp.txt] [NV98:NVA0 NVAA-]
4: PMEDIA [io/pmedia.txt]
8: PFIFO [fifo/nv50-pfifo.txt]
12: PGRAPH [graph/nv50-pgraph.txt]
13: PCOPY [fifo/pcopy.txt] [NVA3-]
- 14: PCRYPT [vdec/vp2/pcrypt.txt, vdec/vp3/pcrypt.txt] [NV84:NVA3]
+ 14: PCRYPT2 [vdec/vp2/pcrypt2.txt] [NV84:NV98 NVA0:NVAA]
+ 14: PCRYPT3 [vdec/vp3/pcrypt3.txt] [NV98:NVA0 NVAA:NVA3]
14: PVCOMP [vdec/pvcomp.txt] [NVAF]
15: PBSP [vdec/vp2/pbsp.txt] [NV84:NV98 NVA0:NVAA]
15: PVLD [vdec/vp3/pvld.txt] [NV98:NVA0 NVAA-]
@@ -205,7 +206,8 @@ On NV50:NVC0, the bits are:
23: PCOPY CHSW [NVA3-]
24: PVP2 CHSW [NV84:NV98 NVA0:NVAA] [fifo/nv50-pfifo.txt]
24: PVDEC CHSW [NV98:NVA0 NVAA-] [fifo/nv50-pfifo.txt]
- 25: PCRYPT CHSW [NV84:NVA3] [fifo/nv50-pfifo.txt]
+ 25: PCRYPT2 CHSW [NV84:NV98 NVA0:NVAA] [fifo/nv50-pfifo.txt]
+ 25: PCRYPT3 CHSW [NV98:NVA0 NVAA:NVA3] [fifo/nv50-pfifo.txt]
25: PVCOMP CHSW [NVAF] [fifo/nv50-pfifo.txt]
26: PBSP CHSW [NV84:NV98 NVA0:NVAA] [fifo/nv50-pfifo.txt]
26: PVLD CHSW [NV98:NVA0 NVAA-] [fifo/nv50-pfifo.txt]
@@ -367,15 +369,16 @@ For NV04:NV50:
For NV50:NVC0:
-0: VPE [vdec/vpe/intro.txt] [NV50:NV98 and NVA0]
-0: PPPP [vdec/vp3/pppp.txt] [NV98 and NVAA-]
+0: VPE [vdec/vpe/intro.txt] [NV50:NV98 NVA0:NVAA]
+0: PPPP [vdec/vp3/pppp.txt] [NV98:NVA0 NVAA-]
4: PMEDIA [io/pmedia.txt]
8: PFIFO [fifo/nv50-pfifo.txt] - has separate NRHOST line on NVA3+
9: ??? [NVA3?-]
11: ??? [NVA3?-]
12: PGRAPH [graph/nv50-pgraph.txt]
13: ??? [NVA3?-]
-14: PCRYPT [vdec/vp2/pcrypt.txt, vdec/vp3/pcrypt.txt] [NV84:NVA3]
+14: PCRYPT2 [vdec/vp2/pcrypt2.txt] [NV84:NV98 NVA0:NVAA]
+14: PCRYPT3 [vdec/vp3/pcrypt3.txt] [NV98:NVA0 NVAA:NVA3]
14: PVCOMP [vdec/pvcomp.txt] [NVAF-]
15: PBSP [vdec/vp2/pbsp.txt] [NV84:NV98 NVA0:NVAA]
15: PVLD [vdec/vp3/pvld.txt] [NV98:NVA0 NVAA-]
View
2 hwdocs/chipsets.txt
@@ -486,7 +486,7 @@ NVA3:
- PGRAPH additions for D3D10.1 support
- added HDA audio codec for HDMI sound support, on a separate PCI function
- Added PCOPY, the dedicated copy engine
- - Merged PCRYPT functionality into PVLD
+ - Merged PCRYPT3 functionality into PVLD
NVAF:
- added PVCOMP, the video compositor engine
View
2 hwdocs/falcon/intro.txt
@@ -47,7 +47,7 @@ The falcon units present on nvidia cards are:
- PVDEC, the video decoder [vdec/vp3/pvdec.txt]
- PPPP, the video post-processor [vdec/vp3/pppp.txt]
- The VP3 cryptographic engine [NV98, NVAA, NVAC]:
- - PCRYPT, the cryptographic engine [vdec/vp3/pcrypt.txt]
+ - PCRYPT3, the cryptographic engine [vdec/vp3/pcrypt3.txt]
- The NVA3:NVE4 copy engines:
- PCOPY0 [NVA3:NVE4] [fifo/pcopy.txt]
- PCOPY1 [NVC0:NVE4] [fifo/pcopy.txt]
View
2 hwdocs/fifo/classes.txt
@@ -79,7 +79,7 @@ mem an engine object representing memory copy/fill/upload functionality to
/m2mf a PGRAPH engine object representing memory to memory copy functionality
/p2mf a PGRAPH engine object representing FIFO to memory upload functionality
-crypt a PCRYPT engine object representing crypto functionality
+crypt a PCRYPT2 engine object representing crypto functionality
[XXX: VPE trio]
View
6 hwdocs/fifo/intro.txt
@@ -48,7 +48,7 @@ idx| name | cards | description
--------------| | bitstream processor. Microcoded through embedded
6/-| PBSP | NV84:NV98 | xtensa cores. [see vdec/vp2/pvp2.txt, vdec/vp2/pbsp.txt]
--------------| |---------------------------------------------------
-5/-| PCRYPT | | AES cryptography and copy engine. [see vdec/vp2/crypt.txt]
+5/-| PCRYPT2 | | AES cryptography and copy engine. [see vdec/vp2/crypt.txt]
------------------------------------------------------------------------------
2/2| PPPP | | VP3 falcon-microcoded video decoding engines: picture
--------------| | post-processor, video processor, bitstream
@@ -57,8 +57,8 @@ idx| name | cards | description
6/3| PVLD | |
------------------------------------------------------------------------------
| | | falcon-microcoded engine with AES crypto coprocessor.
-5/-| PCRYPT | NV98:NVA3 | On NVA3+, the crypto powers were instead merged
- | | | into PVLD. [see vdec/vp3/pcrypt.txt]
+5/-| PCRYPT3 | NV98:NVA3 | On NVA3+, the crypto powers were instead merged
+ | | | into PVLD. [see vdec/vp3/pcrypt3.txt]
------------------------------------------------------------------------------
5/-| PVCOMP | NVAF:NVC0 | falcon-microcoded video compositing engine
| | | [see vdec/pvcomp.txt]
View
2 hwdocs/glossary.txt
@@ -69,7 +69,7 @@ P
PFIFO: command stream processing engine. Gathers FIFO commands from user
buffers and direct submission, sorting them out and sending them to execution
engines, which [depending on chipset] may include: PGRAPH, PMPEG, PME, PVP1,
-PVP2, PBSP, PCRYPT, PVLD, PVDEC, PPPP, PCOPY, PVENC, plus some unknown ones.
+PVP2, PBSP, PCRYPT2, PVLD, PVDEC, PPPP, PCRYPT3, PVCOMP, PCOPY, PVENC.
R
View
6 hwdocs/index.txt
@@ -201,15 +201,15 @@ VP2 video decoding:
[** ] vdec/vp2/vld.txt - VP2 variable length decoding engine
[**** ] vdec/vp2/mbring.txt - VP2 MBRING format
[** ] vdec/vp2/macro.txt - the VP2 command macro processor
-[ ] vdec/vp2/pcrypt.txt - NV84:NV98 and NVA0 PCRYPT engine
-[ ] vdec/vp2/crypt.txt - NV84 PCRYPT user interface
+[ ] vdec/vp2/pcrypt2.txt - PCRYPT2 engine
+[ ] vdec/vp2/crypt.txt - PCRYPT2 user interface
VP3/VP4/VP5 video decoding:
[** ] vdec/vp3/mbring.txt - VP3 MBRING format
[* ] vdec/vp3/pvld.txt - falcon-based PVLD engine
[* ] vdec/vp3/pvdec.txt - falcon-based PVDEC engine
[* ] vdec/vp3/pppp.txt - falcon-based PPPP engine
-[* ] vdec/vp3/pcrypt.txt - falcon-based PCRYPT engine
+[* ] vdec/vp3/pcrypt3.txt - falcon-based PCRYPT3 engine
Other FIFO engines:
View
22 hwdocs/memory/nv50-vm.txt
@@ -89,8 +89,8 @@ VM is used by several clients, which are identified by VM client id:
- c: PVDEC [NV98:NVA0 NVAA-]
- d: PBSP [NV84:NV98 NVA0:NVAA]
- d: PVLD [NV98:NVA0 NVAA-]
- - e: PCRYPT [NV84:NV98 NVA0:NVAA]
- - e: PCRYPT [NV98:NVA0 NVAA:NVA3]
+ - e: PCRYPT2 [NV84:NV98 NVA0:NVAA]
+ - e: PCRYPT3 [NV98:NVA0 NVAA:NVA3]
- f: PCOUNTER [NV84-]
- 11: PDAEMON [NVA3-]
- 13: PCOPY [NVA3-]
@@ -113,8 +113,8 @@ to be part of several VM engines. The engines are:
- 8: PPPP: PPPP [NV98:NVA0 NVAA-]
- 9: PBSP: PBSP [NV84:NV98 NVA0:NVAA]
- 9: PVLD: PVLD [NV98:NVA0 NVAA-]
- - a: PCRYPT: PCRYPT [NV84:NV98 NVA0:NVAA]
- - a: PCRYPT: PCRYPT [NV98:NVA0 NVAA:NVA3]
+ - a: PCRYPT2: PCRYPT2 [NV84:NV98 NVA0:NVAA]
+ - a: PCRYPT3: PCRYPT3 [NV98:NVA0 NVAA:NVA3]
- b: PCOUNTER: PCOUNTER
- c: SEMAPHORE_BG: PFIFO_READ - handles background semaphore acquire polling
- d: PCOPY: PCOPY [NVA3-]
@@ -167,14 +167,14 @@ ids depends on both engine and client id. The DMA slots are
- b/f/0: PCOUNTER record buffer [NV84:NVC0]
- 1/c/0-f: PVP2 DMA ports 0-0xf [NV84:NV98 NVA0:NVAA]
- 9/d/0-f: PBSP DMA ports 0-0xf [NV84:NV98 NVA0:NVAA]
- - a/e/0: PCRYPT context [NV84:NV98 NVA0:NVAA]
- - a/e/1: PCRYPT SRC [NV84:NV98 NVA0:NVAA]
- - a/e/2: PCRYPT DST [NV84:NV98 NVA0:NVAA]
- - a/e/3: PCRYPT QUERY [NV84:NV98 NVA0:NVAA]
+ - a/e/0: PCRYPT2 context [NV84:NV98 NVA0:NVAA]
+ - a/e/1: PCRYPT2 SRC [NV84:NV98 NVA0:NVAA]
+ - a/e/2: PCRYPT2 DST [NV84:NV98 NVA0:NVAA]
+ - a/e/3: PCRYPT2 QUERY [NV84:NV98 NVA0:NVAA]
- 1/c/0-7: PVDEC falcon ports 0-7 [NV98:NVA0 NVAA-]
- 8/6/0-7: PPPP falcon ports 0-7 [NV98:NVA0 NVAA-]
- 9/d/0-7: PVLD falcon ports 0-7 [NV98:NVA0 NVAA-]
- - a/e/0-7: PCRYPT falcon ports 0-7 [NV98:NVA3]
+ - a/e/0-7: PCRYPT3 falcon ports 0-7 [NV98:NVA3]
- d/13/0-7: PCOPY falcon ports 0-7 [NVA3-]
- e/11/0-7: PDAEMON falcon ports 0-7 [NVA3-]
- 7/14/0-7: PVCOMP falcon ports 0-7 [NVAF-]
@@ -330,8 +330,8 @@ selector | address | cards | engine
0x0006 | 0x00060 | NV98:NVA0 NVAA- | PPPP
0x0008 | 0x00080 | NV84:NV98 NVA0:NVAA | PBSP
0x0008 | 0x00080 | NV98:NVA0 NVAA- | PVLD
- 0x000a | 0x000a0 | NV84:NV98 NVA0:NVAA | PCRYPT
- 0x000a | 0x000a0 | NV98:NVA0 NVAA:NVA3 | PCRYPT
+ 0x000a | 0x000a0 | NV84:NV98 NVA0:NVAA | PCRYPT2
+ 0x000a | 0x000a0 | NV98:NVA0 NVAA:NVA3 | PCRYPT3
0x000a | 0x000a0 | NVAF- | PVCOMP
0x000c | 0x000c0 | NVA3- | PCOPY
View
4 hwdocs/mmio.txt
@@ -189,15 +189,15 @@ c00000:1000000 NEW_USER - PFIFO DMA submission area [fifo/dma-pusher.txt]
084000:085000 I PVLD - VP3 variable length decoding engine [NV98, NVAA-] [vdec/vp3/pvld.txt]
085000:086000 I PVDEC - VP3 video decoding engine [NV98, NVAA-] [vdec/vp3/pvdec.txt]
086000:087000 I PPPP - VP3 video postprocessing engine [NV98, NVAA-] [vdec/vp3/pppp.txt]
-087000:088000 I PCRYPT - VP3 cryptographic engine [NV98, NVAA:NVA3] [vdec/vp3/pcrypt.txt]
+087000:088000 I PCRYPT3 - VP3 cryptographic engine [NV98, NVAA:NVA3] [vdec/vp3/pcrypt3.txt]
088000:089000 I PPCI - PCI config space access [bus/pci.txt]
089000:08a000 I ??? [NV84-]
08a000:08b000 I PPCI_HDA - PCI config space access for the HDA codec function [NVA3-] [bus/pci.txt]
090000:0a0000 R PFIFO cache - part of PFIFO [fifo/nv50-pfifo.txt]
0a0000:0c0000 R PRMFB - aliases VGA memory window [display/nv50/vga.txt]
100000:101000 I PFB - memory interface and VM control [memory/nv50-pfb.txt]
101000:102000 I PSTRAPS - straps readout / override [io/pstraps.txt]
-102000:103000 I PCRYPT - VP2 cryptographic engine [NV84:NV98, NVA0] [vdec/vp2/pcrypt.txt]
+102000:103000 I PCRYPT2 - VP2 cryptographic engine [NV84:NV98, NVA0] [vdec/vp2/pcrypt2.txt]
102000:103000 R ??? - IGPs only [XXX]
103000:104000 I PBSP - VP2 BSP engine [NV84:NV98, NVA0] [vdec/vp2/pbsp.txt]
104000:105000 I PCOPY - memory copy engine [NVA3-] [fifo/pcopy.txt]
View
34 hwdocs/pcounter/nv40.txt
@@ -123,12 +123,12 @@ set 3 [MPs]:
0x20 trailer base
set 5:
-0x37: PCRYPT PM_TRIGGER 2nd
-0x38: PCRYPT WRCACHE_FLUSH 2nd
-0x3b: PCRYPT idle
-0x45: PCRYPT PM_TRIGGER
-0x46: PCRYPT WRCACHE_FLUSH
-0x47-0x4c: PCRYPT USER
+0x37: PCRYPT3 PM_TRIGGER 2nd
+0x38: PCRYPT3 WRCACHE_FLUSH 2nd
+0x3b: PCRYPT3 idle
+0x45: PCRYPT3 PM_TRIGGER
+0x46: PCRYPT3 WRCACHE_FLUSH
+0x47-0x4c: PCRYPT3 USER
0x60 trailer base
set 7:
@@ -172,7 +172,7 @@ set 0:
== NVAC signals ==
set 2:
-0xd4-0xd9: PCRYPT_USER_0-5 [falcon/perf.txt]
+0xd4-0xd9: PCRYPT3_USER_0-5 [falcon/perf.txt]
=== NVA5 signals ===
@@ -432,16 +432,16 @@ VUC_SLEEP |5e|??|??|??|89|??|??| vdec/vuc/perf.txt
VUC_WATCHDOG |5f|??|??|??|8a|??|??| vdec/vuc/perf.txt
VUC_USER_CONT |60|??|??|??|8b|??|??| vdec/vuc/perf.txt
VUC_USER_PULSE |61|??|??|??|8c|??|??| vdec/vuc/perf.txt
-PVDEC_IDLE |90|??|??|??|40|??|??| falcon/perf.txt
-PVDEC_TA |93|??|??|??|43|??|??| falcon/perf.txt
-PVDEC_PM_TRIGGER |9a|??|??|??|4a|??|??| falcon/perf.txt
-PVDEC_WRCACHE_FL |9b|??|??|??|4b|??|??| falcon/perf.txt
-PVDEC_USER_0 |9c|??|9c|??|4c|??|4c| falcon/perf.txt
-PVDEC_USER_1 |9d|??|9d|??|4d|??|4d| falcon/perf.txt
-PVDEC_USER_2 |9e|??|9e|??|4e|??|4e| falcon/perf.txt
-PVDEC_USER_3 |9f|??|9f|??|4f|??|4f| falcon/perf.txt
-PVDEC_USER_4 |a0|??|a0|??|50|??|50| falcon/perf.txt
-PVDEC_USER_5 |a1|??|a1|??|51|??|51| falcon/perf.txt
+PVDEC_IDLE |90|??|??|??|40|??|??| falcon/perf.txt
+PVDEC_TA |93|??|??|??|43|??|??| falcon/perf.txt
+PVDEC_PM_TRIGGER |9a|??|??|??|4a|??|??| falcon/perf.txt
+PVDEC_WRCACHE_FL |9b|??|??|??|4b|??|??| falcon/perf.txt
+PVDEC_USER_0 |9c|??|9c|??|4c|??|4c| falcon/perf.txt
+PVDEC_USER_1 |9d|??|9d|??|4d|??|4d| falcon/perf.txt
+PVDEC_USER_2 |9e|??|9e|??|4e|??|4e| falcon/perf.txt
+PVDEC_USER_3 |9f|??|9f|??|4f|??|4f| falcon/perf.txt
+PVDEC_USER_4 |a0|??|a0|??|50|??|50| falcon/perf.txt
+PVDEC_USER_5 |a1|??|a1|??|51|??|51| falcon/perf.txt
PVCOMP_USER_0 |--|--|--|--|--|--|60| falcon/perf.txt
PVCOMP_USER_1 |--|--|--|--|--|--|61| falcon/perf.txt
PVCOMP_USER_2 |--|--|--|--|--|--|62| falcon/perf.txt
View
0 hwdocs/vdec/vp2/pcrypt.txt → hwdocs/vdec/vp2/pcrypt2.txt
File renamed without changes.
View
0 hwdocs/vdec/vp3/pcrypt.txt → hwdocs/vdec/vp3/pcrypt3.txt
File renamed without changes.
View
2 nva/nvafucstart.c
@@ -75,7 +75,7 @@ int main(int argc, char **argv) {
}
if (!base) {
- fprintf (stderr, "No engine specified. Specify -b for PVLD, -v for PVDEC, -p for PPPP, -s for PCRYPT, -o for PCOPY\n");
+ fprintf (stderr, "No engine specified. Specify -b for PVLD, -v for PVDEC, -p for PPPP, -s for PCRYPT3, -o for PCOPY\n");
return 1;
}
View
4 nva/nvatiming.c
@@ -545,8 +545,8 @@ int main(int argc, char **argv)
printf("\n");
if (card->chipset == 0x98 || card->chipset == 0xaa || card->chipset == 0xac) {
- time_fuc_engine_periodic(cnum, "PCRYPT", 0x87000);
- time_fuc_engine_watchdog(cnum, "PCRYPT", 0x87000);
+ time_fuc_engine_periodic(cnum, "PCRYPT3", 0x87000);
+ time_fuc_engine_watchdog(cnum, "PCRYPT3", 0x87000);
printf("\n");
} else {
printf("Your card doesn't support PCOPY (chipset < nva3 only)\n\n");
View
6 rnndb/nv10_pfb.xml
@@ -425,7 +425,8 @@
<value value="0xd" name="PVDEC" variants="NV98:NVA0 NVAA-"/>
<value value="0xe" name="PBSP" variants="NV84:NV98 NVA0:NVAA"/>
<value value="0xe" name="PVLD" variants="NV98:NVA0 NVAA-"/>
- <value value="0xf" name="PCRYPT" variants="NV84:NVA3"/>
+ <value value="0xf" name="PCRYPT2" variants="NV84:NV98 NVA0:NVAA"/>
+ <value value="0xf" name="PCRYPT3" variants="NV98:NVA0 NVAA:NVA3"/>
<value value="0x10" name="PCOUNTER" variants="NV84-"/>
<value value="0x12" name="PDAEMON" variants="NVA3-"/>
@@ -451,7 +452,8 @@
<bitfield pos="18" name="PPPP_ENABLE" variants="NV98:NVA0 NVAA-"/>
<bitfield pos="19" name="PBSP_ENABLE" variants="NV84:NV98 NVA0:NVAA"/>
<bitfield pos="19" name="PVLD_ENABLE" variants="NV98:NVA0 NVAA-"/>
- <bitfield pos="20" name="PCRYPT_ENABLE" variants="NV84:NVA3"/>
+ <bitfield pos="20" name="PCRYPT2_ENABLE" variants="NV84:NV98 NVA0:NVAA"/>
+ <bitfield pos="20" name="PCRYPT3_ENABLE" variants="NV98:NVA0 NVAA:NVA3"/>
<bitfield pos="21" name="PCOUNTER_ENABLE" variants="NV84-"/>
<bitfield pos="23" name="PDAEMON_ENABLE" variants="NVA3-"/>
<bitfield low="24" high="26" name="INDEX"/>
View
4 rnndb/nv40_pcounter.xml
@@ -162,8 +162,8 @@
<bitfield pos="8" name="PGRAPH"/>
<bitfield pos="9" name="PBSP" variants="NV84:NV98 NVA0:NVAA"/>
<bitfield pos="9" name="PVLD" variants="NV98:NVA0 NVAA-"/>
- <bitfield pos="10" name="PCRYPT" variants="NV84:NV98 NVA0:NVAA"/>
- <bitfield pos="10" name="PCRYPT" variants="NV98:NVA0 NVAA:NVA3"/>
+ <bitfield pos="10" name="PCRYPT2" variants="NV84:NV98 NVA0:NVAA"/>
+ <bitfield pos="10" name="PCRYPT3" variants="NV98:NVA0 NVAA:NVA3"/>
<bitfield pos="11" name="PVP2" variants="NV84:NV98 NVA0:NVAA"/>
<bitfield pos="11" name="PVDEC" variants="NV98:NVA0 NVAA-"/>
<bitfield pos="12" name="PPPP" variants="NV98:NVA0 NVAA-"/>
View
9 rnndb/nv50_pfifo.xml
@@ -17,7 +17,8 @@
<value value="4" name="PVP1" variants="NV50:NV84"/>
<value value="4" name="PVP2" variants="NV84:NV98 NVA0:NVAA"/>
<value value="4" name="PVDEC" variants="NV98:NVA0 NVAA-"/>
- <value value="5" name="PCRYPT" variants="NV84:NVA3"/>
+ <value value="5" name="PCRYPT2" variants="NV84:NV98 NVA0:NVAA"/>
+ <value value="5" name="PCRYPT3" variants="NV98:NVA0 NVAA:NVA3"/>
<value value="5" name="PVCOMP" variants="NVAF-"/>
<value value="6" name="PBSP" variants="NV84:NV98 NVA0:NVAA"/>
<value value="6" name="PVLD" variants="NV98:NVA0 NVAA-"/>
@@ -33,7 +34,8 @@
<bitfield pos="3" name="PVP1" variants="NV50:NV84"/>
<bitfield pos="3" name="PVP2" variants="NV84:NV98 NVA0:NVAA"/>
<bitfield pos="3" name="PVDEC" variants="NV98:NVA0 NVAA-"/>
- <bitfield pos="4" name="PCRYPT" variants="NV84:NVA3"/>
+ <bitfield pos="4" name="PCRYPT2" variants="NV84:NV98 NVA0:NVAA"/>
+ <bitfield pos="4" name="PCRYPT3" variants="NV98:NVA0 NVAA:NVA3"/>
<bitfield pos="4" name="UNUSED4" variants="NVA3:NVAF"/>
<bitfield pos="4" name="PVCOMP" variants="NVAF-"/>
<bitfield pos="5" name="PBSP" variants="NV84:NV98 NVA0:NVAA"/>
@@ -105,7 +107,8 @@
<bitfield low="12" high="15" name="PVP2" variants="NV84:NV98 NVA0:NVAA"/>
<bitfield low="12" high="15" name="PVDEC" variants="NV98:NVA0 NVAA-"/>
<bitfield low="16" high="23" name="UNK16"/>
- <bitfield low="24" high="27" name="PCRYPT" variants="NV84:NVA3"/>
+ <bitfield low="24" high="27" name="PCRYPT2" variants="NV84:NV98 NVA0:NVAA"/>
+ <bitfield low="24" high="27" name="PCRYPT3" variants="NV98:NVA0 NVAA:NVA3"/>
<bitfield low="24" high="27" name="UNUSED4" variants="NVA3:NVAF"/>
<bitfield low="24" high="27" name="PVCOMP" variants="NVAF-"/>
<bitfield low="28" high="31" name="PBSP" variants="NV84:NV98 NVA0:NVAA"/>
View
6 rnndb/nv50_vm.xml
@@ -16,7 +16,8 @@
<value value="8" name="PPPP" variants="NV98:NVA0 NVAA-"/>
<value value="9" name="PBSP" variants="NV50:NV98 NVA0:NVAA"/>
<value value="9" name="PVLD" variants="NV98:NVA0 NVAA-"/>
- <value value="0xa" name="PCRYPT" variants="NV84:NVA3"/>
+ <value value="0xa" name="PCRYPT2" variants="NV84:NV98 NVA0:NVAA"/>
+ <value value="0xa" name="PCRYPT3" variants="NV98:NVA0 NVAA:NVA3"/>
<value value="0xb" name="PCOUNTER" variants="NV84-"/>
<value value="0xc" name="SEMAPHORE_BG" variants="NV84-"/>
<value value="0xd" name="PCOPY" variants="NVA3-"/>
@@ -39,7 +40,8 @@
<value value="0x0c" name="PVDEC" variants="NV98:NVA0 NVAA-"/>
<value value="0x0d" name="PBSP" variants="NV84:NV98 NVA0:NVAA"/>
<value value="0x0d" name="PVLD" variants="NV98:NVA0 NVAA-"/>
- <value value="0x0e" name="PCRYPT" variants="NV84-"/>
+ <value value="0x0e" name="PCRYPT2" variants="NV84:NV98 NVA0:NVAA"/>
+ <value value="0x0e" name="PCRYPT3" variants="NV98:NVA0 NVAA:NVA3"/>
<value value="0x0f" name="PCOUNTER" variants="NV84-"/>
<value value="0x11" name="PDAEMON" variants="NVA3-"/>
<value value="0x13" name="PCOPY" variants="NVA3-"/>
View
8 rnndb/nv84_pcrypt.xml → rnndb/nv84_pcrypt2.xml
@@ -8,15 +8,15 @@
<domain name="NV_MMIO" bare="yes" prefix="chipset">
-<array name="PCRYPT" offset="0x102000" stride="0x1000" length="1" variants="NV84:NV98 NVA0">
+<array name="PCRYPT2" offset="0x102000" stride="0x1000" length="1" variants="NV84:NV98 NVA0">
<reg32 offset="0x00c" name="UNK00C">
<bitfield pos="0" name="UNK0"/>
<bitfield pos="4" name="FIFO_ACCESS"/>
<bitfield pos="8" name="UNK8"/>
<bitfield low="12" high="14" name="UNK12"/>
</reg32>
- <bitset name="nv84_pcrypt_intr" inline="yes">
+ <bitset name="nv84_pcrypt2_intr" inline="yes">
<bitfield pos="0" name="INVALID_STATE"/>
<bitfield pos="1" name="ILLEGAL_MTHD"/>
<bitfield pos="2" name="ILLEGAL_CLASS"/>
@@ -34,8 +34,8 @@
<bitfield low="24" high="28" name="UNK24"/>
<bitfield pos="30" name="UNK30"/>
</reg32>
- <reg32 offset="0x130" name="INTR" type="nv84_pcrypt_intr"/>
- <reg32 offset="0x140" name="INTR_EN" type="nv84_pcrypt_intr"/>
+ <reg32 offset="0x130" name="INTR" type="nv84_pcrypt2_intr"/>
+ <reg32 offset="0x140" name="INTR_EN" type="nv84_pcrypt2_intr"/>
<reg32 offset="0x180" name="INSTANCE"/>
<reg32 offset="0x188" name="CHAN_CUR"/>
<reg32 offset="0x18c" name="CHAN_NEXT"/>
View
6 rnndb/nv98_pcrypt.xml → rnndb/nv98_pcrypt3.xml
@@ -10,18 +10,18 @@
<domain name="NV_MMIO" bare="yes" prefix="chipset">
-<bitset name="NV98_PCRYPT_INTR" varset="chipset">
+<bitset name="NV98_PCRYPT3_INTR" varset="chipset">
<bitfield low="0" high="7" name="FALCON" type="falcon_intr"/>
<bitfield pos="8" name="MEMIF_TARGET_INVALID"/>
<bitfield pos="9" name="MEMIF_FAULT"/>
<bitfield pos="10" name="CRYPT"/>
</bitset>
-<bitset name="NV98_PCRYPT_STATUS" varset="chipset">
+<bitset name="NV98_PCRYPT3_STATUS" varset="chipset">
<bitfield pos="0" name="FALCON"/>
<bitfield pos="1" name="MEMIF"/>
</bitset>
-<array name="PCRYPT" offset="0x87000" stride="0x1000" length="1" variants="NV98 NVAA:NVA3">
+<array name="PCRYPT3" offset="0x87000" stride="0x1000" length="1" variants="NV98 NVAA:NVA3">
<use-group name="falcon_base"/>
<use-group name="falcon_memif"/>
<use-group name="falcon_crypt"/>
View
8 rnndb/nv_mmio.xml
@@ -106,8 +106,8 @@
<!-- 086000 - 086fff PPPP -->
<import file="nv98_pppp.xml" />
-<!-- 087000 - 087fff PCRYPT -->
-<import file="nv98_pcrypt.xml" />
+<!-- 087000 - 087fff PCRYPT3 -->
+<import file="nv98_pcrypt3.xml" />
<!-- 088000 - 088fff PPCI -->
<import file="nv_pci.xml" />
@@ -138,8 +138,8 @@
<!-- 101000 - 101fff PTIMER covered in nv01_ptimer.xml -->
-<!-- 102000 - 102fff PCRYPT -->
-<import file="nv84_pcrypt.xml" />
+<!-- 102000 - 102fff PCRYPT2 -->
+<import file="nv84_pcrypt2.xml" />
<!-- 103000 - 103fff PBSP -->
<import file="nv84_pbsp.xml" />
View
8 rnndb/nv_pbus.xml
@@ -181,7 +181,7 @@
</bitfield>
<bitfield pos="29" name="UNK29"/>
<bitfield pos="30" name="VDEC">
- <doc>Selects whether video decoding engines (PMPEG, PME, PVP1, PVP2, PBSP, VP3 PVLD, PVDEC, PPPP, VP2 PCRYPT, but not VP3 PCRYPT nor VP4 PVLD) are enabled.</doc>
+ <doc>Selects whether video decoding engines (PMPEG, PME, PVP1, PVP2, PBSP, VP3 PVLD, PVDEC, PPPP, PCRYPT2, but not PCRYPT3 nor VP4 PVLD) are enabled.</doc>
</bitfield>
<bitfield pos="31" name="UNK31"/>
</reg32>
@@ -190,7 +190,8 @@
<bitfield pos="2" name="PDISPLAY"/>
<bitfield pos="5" name="PBSP" variants="NV84:NV98 NVA0:NVAA"/>
<bitfield pos="5" name="PVLD" variants="NV98:NVA0 NVAA-"/>
- <bitfield pos="6" name="PCRYPT" variants="NV84:NVA3"/>
+ <bitfield pos="6" name="PCRYPT2" variants="NV84:NV98 NVA0:NVAA"/>
+ <bitfield pos="6" name="PCRYPT3" variants="NV98:NVA0 NVAA:NVA3"/>
<bitfield pos="6" name="PVCOMP" variants="NVAF-"/>
<bitfield pos="9" name="PCOPY" variants="NVA3-"/>
</reg32>
@@ -241,7 +242,8 @@
<bitfield high="9" low="8" name="PVDEC" variants="NV98:NVA0 NVAA-">
<doc>XXX: Does not work on NVAC Asus AT3IONT-I (Deluxe)?</doc>
</bitfield>
- <bitfield high="11" low="10" name="PCRYPT" variants="NV84:NVA3"/>
+ <bitfield high="11" low="10" name="PCRYPT2" variants="NV84:NV98 NVA0:NVAA"/>
+ <bitfield high="11" low="10" name="PCRYPT3" variants="NV98:NVA0 NVAA:NVA3"/>
<bitfield high="11" low="10" name="PVCOMP" variants="NVAF-"/>
<bitfield high="13" low="12" name="PBSP" variants="NV84:NV98 NVA0:NVAA"/>
<bitfield high="13" low="12" name="PVLD" variants="NV98:NVA0 NVAA-">
View
9 rnndb/nv_pmc.xml
@@ -63,7 +63,8 @@
<bitfield pos="13" name="PDMA" variants="NV03:NV04"/>
<bitfield pos="13" name="UNK13" variants="NVA3:NVC0" />
<bitfield pos="13" name="PBFB" variants="NVC0-"/>
- <bitfield pos="14" name="PCRYPT" variants="NV84:NVA3"/>
+ <bitfield pos="14" name="PCRYPT2" variants="NV84:NV98 NVA0:NVAA"/>
+ <bitfield pos="14" name="PCRYPT3" variants="NV98:NVA0 NVAA:NVA3"/>
<bitfield pos="14" name="UNK14" variants="NVA3:NVAF" />
<bitfield pos="14" name="PVCOMP" variants="NVAF:NVC0"/>
<bitfield pos="15" name="PBSP" variants="NV84:NV98 NVA0:NVAA"/>
@@ -136,7 +137,8 @@
<bitfield pos="12" name="PGRAPH" />
<bitfield pos="13" name="PCOPY" variants="NVA3:NVC0"/>
<bitfield pos="13" name="PDAEMON" variants="NVC0-"/>
- <bitfield pos="14" name="PCRYPT" variants="NV84:NVA3"/>
+ <bitfield pos="14" name="PCRYPT2" variants="NV84:NV98 NVA0:NVAA"/>
+ <bitfield pos="14" name="PCRYPT3" variants="NV98:NVA0 NVAA:NVA3"/>
<bitfield pos="14" name="PVCOMP" variants="NVAF:NVC0"/>
<bitfield pos="15" name="PBSP" variants="NV84:NV98 NVA0:NVAA"/>
<bitfield pos="15" name="PVLD" variants="NV98:NVA0 NVAA-"/>
@@ -156,7 +158,8 @@
<bitfield pos="23" name="PCOPY_CHSW" variants="NVA3:NVC0"/>
<bitfield pos="24" name="PVP2_CHSW" variants="NV84:NV98 NVA0:NVAA"/>
<bitfield pos="24" name="PVDEC_CHSW" variants="NV98:NVA0 NVAA:NVC0"/>
- <bitfield pos="25" name="PCRYPT_CHSW" variants="NV84:NVA3"/>
+ <bitfield pos="25" name="PCRYPT2_CHSW" variants="NV84:NV98 NVA0:NVAA"/>
+ <bitfield pos="25" name="PCRYPT3_CHSW" variants="NV98:NVA0 NVAA:NVA3"/>
<bitfield pos="25" name="UNUSED4_CHSW" variants="NVA3:NVAF"/>
<bitfield pos="25" name="PVCOMP_CHSW" variants="NVAF:NVC0"/>
<bitfield pos="26" name="PBSP_CHSW" variants="NV84:NV98 NVA0:NVAA"/>

0 comments on commit be1c261

Please sign in to comment.
Something went wrong with that request. Please try again.