Commit b448a266 authored by Timur Tabi's avatar Timur Tabi Committed by Ben Skeggs
Browse files

drm/nouveau/nvfw: firmware structures should begin with nvfw_ 



Rename all structures that are used directly by firmware to have a nvfw_
prefix.

This makes it easier to identify structures that have a fixed, specific
layout.  A future patch will define several more such structures, so it's
important to be consistent now.

Signed-off-by: default avatarTimur Tabi <ttabi@nvidia.com>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 804f5705

drivers/gpu/drm/nouveau/include/nvfw/pmu.h

+3 −3
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ struct nv_pmu_args { 
#define NV_PMU_UNIT_ACR                                                    0x0a



struct nv_pmu_init_msg {

	struct nv_falcon_msg hdr;

	struct nvfw_falcon_msg hdr;

#define NV_PMU_INIT_MSG_INIT                                               0x00

	u8 msg_type;
@@ -44,7 +44,7 @@ struct nv_pmu_init_msg { 
};



struct nv_pmu_acr_cmd {

	struct nv_falcon_cmd hdr;

	struct nvfw_falcon_cmd hdr;

#define NV_PMU_ACR_CMD_INIT_WPR_REGION                                     0x00

#define NV_PMU_ACR_CMD_BOOTSTRAP_FALCON                                    0x01

#define NV_PMU_ACR_CMD_BOOTSTRAP_MULTIPLE_FALCONS                          0x03
@@ -52,7 +52,7 @@ struct nv_pmu_acr_cmd { 
};



struct nv_pmu_acr_msg {

	struct nv_falcon_cmd hdr;

	struct nvfw_falcon_cmd hdr;

	u8 msg_type;

};

drivers/gpu/drm/nouveau/include/nvfw/sec2.h

+3 −3
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ struct nv_sec2_args { 
#define NV_SEC2_UNIT_ACR                                                   0x08



struct nv_sec2_init_msg {

	struct nv_falcon_msg hdr;

	struct nvfw_falcon_msg hdr;

#define NV_SEC2_INIT_MSG_INIT                                              0x00

	u8 msg_type;
@@ -34,13 +34,13 @@ struct nv_sec2_init_msg { 
};



struct nv_sec2_acr_cmd {

	struct nv_falcon_cmd hdr;

	struct nvfw_falcon_cmd hdr;

#define NV_SEC2_ACR_CMD_BOOTSTRAP_FALCON                                   0x00

	u8 cmd_type;

};



struct nv_sec2_acr_msg {

	struct nv_falcon_cmd hdr;

	struct nvfw_falcon_cmd hdr;

	u8 msg_type;

};

drivers/gpu/drm/nouveau/include/nvkm/core/falcon.h

+5 −5
Original line number Diff line number Diff line
@@ -31,21 +31,21 @@ int gp102_sec2_flcn_enable(struct nvkm_falcon *); 
#define FLCN_ERR(f,fmt,a...) FLCN_PRINTK(error, (f), fmt, ##a)



/**

 * struct nv_falcon_msg - header for all messages

 * struct nvfw_falcon_msg - header for all messages

 *

 * @unit_id:	id of firmware process that sent the message

 * @size:	total size of message

 * @ctrl_flags:	control flags

 * @seq_id:	used to match a message from its corresponding command

 */

struct nv_falcon_msg {

struct nvfw_falcon_msg {

	u8 unit_id;

	u8 size;

	u8 ctrl_flags;

	u8 seq_id;

};



#define nv_falcon_cmd nv_falcon_msg

#define nvfw_falcon_cmd nvfw_falcon_msg

#define NV_FALCON_CMD_UNIT_ID_REWIND                                       0x00



struct nvkm_falcon_qmgr;
@@ -53,7 +53,7 @@ int nvkm_falcon_qmgr_new(struct nvkm_falcon *, struct nvkm_falcon_qmgr **); 
void nvkm_falcon_qmgr_del(struct nvkm_falcon_qmgr **);



typedef int

(*nvkm_falcon_qmgr_callback)(void *priv, struct nv_falcon_msg *);

(*nvkm_falcon_qmgr_callback)(void *priv, struct nvfw_falcon_msg *);



struct nvkm_falcon_cmdq;

int nvkm_falcon_cmdq_new(struct nvkm_falcon_qmgr *, const char *name,
@@ -62,7 +62,7 @@ void nvkm_falcon_cmdq_del(struct nvkm_falcon_cmdq **); 
void nvkm_falcon_cmdq_init(struct nvkm_falcon_cmdq *,

			   u32 index, u32 offset, u32 size);

void nvkm_falcon_cmdq_fini(struct nvkm_falcon_cmdq *);

int nvkm_falcon_cmdq_send(struct nvkm_falcon_cmdq *, struct nv_falcon_cmd *,

int nvkm_falcon_cmdq_send(struct nvkm_falcon_cmdq *, struct nvfw_falcon_cmd *,

			  nvkm_falcon_qmgr_callback, void *priv,

			  unsigned long timeout_jiffies);

drivers/gpu/drm/nouveau/nvkm/engine/sec2/gp102.c

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
#include <nvfw/sec2.h>



static int

gp102_sec2_acr_bootstrap_falcon_callback(void *priv, struct nv_falcon_msg *hdr)

gp102_sec2_acr_bootstrap_falcon_callback(void *priv, struct nvfw_falcon_msg *hdr)

{

	struct nv_sec2_acr_bootstrap_falcon_msg *msg =

		container_of(hdr, typeof(*msg), msg.hdr);

drivers/gpu/drm/nouveau/nvkm/falcon/cmdq.c

+3 −3
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ nvkm_falcon_cmdq_push(struct nvkm_falcon_cmdq *cmdq, void *data, u32 size) 
static void

nvkm_falcon_cmdq_rewind(struct nvkm_falcon_cmdq *cmdq)

{

	struct nv_falcon_cmd cmd;

	struct nvfw_falcon_cmd cmd;



	cmd.unit_id = NV_FALCON_CMD_UNIT_ID_REWIND;

	cmd.size = sizeof(cmd);
@@ -97,7 +97,7 @@ nvkm_falcon_cmdq_close(struct nvkm_falcon_cmdq *cmdq) 
}



static int

nvkm_falcon_cmdq_write(struct nvkm_falcon_cmdq *cmdq, struct nv_falcon_cmd *cmd)

nvkm_falcon_cmdq_write(struct nvkm_falcon_cmdq *cmdq, struct nvfw_falcon_cmd *cmd)

{

	static unsigned timeout = 2000;

	unsigned long end_jiffies = jiffies + msecs_to_jiffies(timeout);
@@ -121,7 +121,7 @@ nvkm_falcon_cmdq_write(struct nvkm_falcon_cmdq *cmdq, struct nv_falcon_cmd *cmd) 
#define CMD_FLAGS_INTR BIT(1)



int

nvkm_falcon_cmdq_send(struct nvkm_falcon_cmdq *cmdq, struct nv_falcon_cmd *cmd,

nvkm_falcon_cmdq_send(struct nvkm_falcon_cmdq *cmdq, struct nvfw_falcon_cmd *cmd,

		      nvkm_falcon_qmgr_callback cb, void *priv,

		      unsigned long timeout)

{