Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 27abc13e authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nv98/crypt: use nouveau_falcon base class 



Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent e3aaa946

drivers/gpu/drm/nouveau/core/engine/crypt/nv84.c

+14 −13
Original line number Diff line number Diff line
@@ -34,11 +34,11 @@ 
#include <engine/crypt.h>



struct nv84_crypt_priv {

	struct nouveau_crypt base;

	struct nouveau_engine base;

};



struct nv84_crypt_chan {

	struct nouveau_crypt_chan base;

	struct nouveau_engctx base;

};



/*******************************************************************************
@@ -96,7 +96,7 @@ nv84_crypt_context_ctor(struct nouveau_object *parent, 
	struct nv84_crypt_chan *priv;

	int ret;



	ret = nouveau_crypt_context_create(parent, engine, oclass, NULL, 256,

	ret = nouveau_engctx_create(parent, engine, oclass, NULL, 256,

				    0, NVOBJ_FLAG_ZERO_ALLOC, &priv);

	*pobject = nv_object(priv);

	if (ret)
@@ -110,11 +110,11 @@ nv84_crypt_cclass = { 
	.handle = NV_ENGCTX(CRYPT, 0x84),

	.ofuncs = &(struct nouveau_ofuncs) {

		.ctor = nv84_crypt_context_ctor,

		.dtor = _nouveau_crypt_context_dtor,

		.init = _nouveau_crypt_context_init,

		.fini = _nouveau_crypt_context_fini,

		.rd32 = _nouveau_crypt_context_rd32,

		.wr32 = _nouveau_crypt_context_wr32,

		.dtor = _nouveau_engctx_dtor,

		.init = _nouveau_engctx_init,

		.fini = _nouveau_engctx_fini,

		.rd32 = _nouveau_engctx_rd32,

		.wr32 = _nouveau_engctx_wr32,

	},

};
@@ -176,7 +176,8 @@ nv84_crypt_ctor(struct nouveau_object *parent, struct nouveau_object *engine, 
	struct nv84_crypt_priv *priv;

	int ret;



	ret = nouveau_crypt_create(parent, engine, oclass, &priv);

	ret = nouveau_engine_create(parent, engine, oclass, true,

				    "PCRYPT", "crypt", &priv);

	*pobject = nv_object(priv);

	if (ret)

		return ret;
@@ -195,7 +196,7 @@ nv84_crypt_init(struct nouveau_object *object) 
	struct nv84_crypt_priv *priv = (void *)object;

	int ret;



	ret = nouveau_crypt_init(&priv->base);

	ret = nouveau_engine_init(&priv->base);

	if (ret)

		return ret;
@@ -210,8 +211,8 @@ nv84_crypt_oclass = { 
	.handle = NV_ENGINE(CRYPT, 0x84),

	.ofuncs = &(struct nouveau_ofuncs) {

		.ctor = nv84_crypt_ctor,

		.dtor = _nouveau_crypt_dtor,

		.dtor = _nouveau_engine_dtor,

		.init = nv84_crypt_init,

		.fini = _nouveau_crypt_fini,

		.fini = _nouveau_engine_fini,

	},

};

drivers/gpu/drm/nouveau/core/engine/crypt/nv98.c

+21 −43
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <core/enum.h>

#include <core/class.h>

#include <core/engctx.h>

#include <core/falcon.h>



#include <subdev/timer.h>

#include <subdev/fb.h>
@@ -36,11 +37,11 @@ 
#include "fuc/nv98.fuc.h"



struct nv98_crypt_priv {

	struct nouveau_crypt base;

	struct nouveau_falcon base;

};



struct nv98_crypt_chan {

	struct nouveau_crypt_chan base;

	struct nouveau_falcon_chan base;

};



/*******************************************************************************
@@ -66,7 +67,7 @@ nv98_crypt_context_ctor(struct nouveau_object *parent, 
	struct nv98_crypt_chan *priv;

	int ret;



	ret = nouveau_crypt_context_create(parent, engine, oclass, NULL, 256,

	ret = nouveau_falcon_context_create(parent, engine, oclass, NULL, 256,

					    256, NVOBJ_FLAG_ZERO_ALLOC, &priv);

	*pobject = nv_object(priv);

	if (ret)
@@ -80,11 +81,11 @@ nv98_crypt_cclass = { 
	.handle = NV_ENGCTX(CRYPT, 0x98),

	.ofuncs = &(struct nouveau_ofuncs) {

		.ctor = nv98_crypt_context_ctor,

		.dtor = _nouveau_crypt_context_dtor,

		.init = _nouveau_crypt_context_init,

		.fini = _nouveau_crypt_context_fini,

		.rd32 = _nouveau_crypt_context_rd32,

		.wr32 = _nouveau_crypt_context_wr32,

		.dtor = _nouveau_falcon_context_dtor,

		.init = _nouveau_falcon_context_init,

		.fini = _nouveau_falcon_context_fini,

		.rd32 = _nouveau_falcon_context_rd32,

		.wr32 = _nouveau_falcon_context_wr32,

	},

};
@@ -153,7 +154,8 @@ nv98_crypt_ctor(struct nouveau_object *parent, struct nouveau_object *engine, 
	struct nv98_crypt_priv *priv;

	int ret;



	ret = nouveau_crypt_create(parent, engine, oclass, &priv);

	ret = nouveau_falcon_create(parent, engine, oclass, 0x087000, true,

				    "PCRYPT", "crypt", &priv);

	*pobject = nv_object(priv);

	if (ret)

		return ret;
@@ -163,36 +165,10 @@ nv98_crypt_ctor(struct nouveau_object *parent, struct nouveau_object *engine, 
	nv_engine(priv)->cclass = &nv98_crypt_cclass;

	nv_engine(priv)->sclass = nv98_crypt_sclass;

	nv_engine(priv)->tlb_flush = nv98_crypt_tlb_flush;

	return 0;

}



static int

nv98_crypt_init(struct nouveau_object *object)

{

	struct nv98_crypt_priv *priv = (void *)object;

	int ret, i;



	ret = nouveau_crypt_init(&priv->base);

	if (ret)

		return ret;



	/* wait for exit interrupt to signal */

	nv_wait(priv, 0x087008, 0x00000010, 0x00000010);

	nv_wr32(priv, 0x087004, 0x00000010);



	/* upload microcode code and data segments */

	nv_wr32(priv, 0x087ff8, 0x00100000);

	for (i = 0; i < ARRAY_SIZE(nv98_pcrypt_code); i++)

		nv_wr32(priv, 0x087ff4, nv98_pcrypt_code[i]);



	nv_wr32(priv, 0x087ff8, 0x00000000);

	for (i = 0; i < ARRAY_SIZE(nv98_pcrypt_data); i++)

		nv_wr32(priv, 0x087ff4, nv98_pcrypt_data[i]);



	/* start it running */

	nv_wr32(priv, 0x08710c, 0x00000000);

	nv_wr32(priv, 0x087104, 0x00000000); /* ENTRY */

	nv_wr32(priv, 0x087100, 0x00000002); /* TRIGGER */

	nv_falcon(priv)->code.data = nv98_pcrypt_code;

	nv_falcon(priv)->code.size = sizeof(nv98_pcrypt_code);

	nv_falcon(priv)->data.data = nv98_pcrypt_data;

	nv_falcon(priv)->data.size = sizeof(nv98_pcrypt_data);

	return 0;

}
@@ -201,8 +177,10 @@ nv98_crypt_oclass = { 
	.handle = NV_ENGINE(CRYPT, 0x98),

	.ofuncs = &(struct nouveau_ofuncs) {

		.ctor = nv98_crypt_ctor,

		.dtor = _nouveau_crypt_dtor,

		.init = nv98_crypt_init,

		.fini = _nouveau_crypt_fini,

		.dtor = _nouveau_falcon_dtor,

		.init = _nouveau_falcon_init,

		.fini = _nouveau_falcon_fini,

		.rd32 = _nouveau_falcon_rd32,

		.wr32 = _nouveau_falcon_wr32,

	},

};

drivers/gpu/drm/nouveau/core/include/engine/crypt.h

+0 −39
Original line number Diff line number Diff line 
#ifndef __NOUVEAU_CRYPT_H__

#define __NOUVEAU_CRYPT_H__



#include <core/engine.h>

#include <core/engctx.h>



struct nouveau_crypt_chan {

	struct nouveau_engctx base;

};



#define nouveau_crypt_context_create(p,e,c,g,s,a,f,d)                          \

	nouveau_engctx_create((p), (e), (c), (g), (s), (a), (f), (d))

#define nouveau_crypt_context_destroy(d)                                       \

	nouveau_engctx_destroy(&(d)->base)

#define nouveau_crypt_context_init(d)                                          \

	nouveau_engctx_init(&(d)->base)

#define nouveau_crypt_context_fini(d,s)                                        \

	nouveau_engctx_fini(&(d)->base, (s))



#define _nouveau_crypt_context_dtor _nouveau_engctx_dtor

#define _nouveau_crypt_context_init _nouveau_engctx_init

#define _nouveau_crypt_context_fini _nouveau_engctx_fini

#define _nouveau_crypt_context_rd32 _nouveau_engctx_rd32

#define _nouveau_crypt_context_wr32 _nouveau_engctx_wr32



struct nouveau_crypt {

	struct nouveau_engine base;

};



#define nouveau_crypt_create(p,e,c,d)                                          \

	nouveau_engine_create((p), (e), (c), true, "PCRYPT", "crypt", (d))

#define nouveau_crypt_destroy(d)                                               \

	nouveau_engine_destroy(&(d)->base)

#define nouveau_crypt_init(d)                                                  \

	nouveau_engine_init(&(d)->base)

#define nouveau_crypt_fini(d,s)                                                \

	nouveau_engine_fini(&(d)->base, (s))



#define _nouveau_crypt_dtor _nouveau_engine_dtor

#define _nouveau_crypt_init _nouveau_engine_init

#define _nouveau_crypt_fini _nouveau_engine_fini



extern struct nouveau_oclass nv84_crypt_oclass;

extern struct nouveau_oclass nv98_crypt_oclass;