Commit 6a25ad3a authored by Marc Zyngier's avatar Marc Zyngier
Browse files

irqchip/gic-v3-its: Rename MAPVI to MAPTI 



Back in the days when the GICv3/v4 architecture was drafted,
the command to an event to an LPI number was called MAPVI.
Later on, and to avoid confusion with the GICv4 command VMAPI,
it was renamed MAPTI. We've carried the old name for a long
time, but it gets in the way of people reading the code in
the light of the public architecture specification.

Just repaint all the references and kill the old definition.

Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
parent 4f46de9d

drivers/irqchip/irq-gic-v3-its.c

+14 −14
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ struct its_cmd_desc { 
			struct its_device *dev;

			u32 phys_id;

			u32 event_id;

		} its_mapvi_cmd;

		} its_mapti_cmd;



		struct {

			struct its_device *dev;
@@ -287,18 +287,18 @@ static struct its_collection *its_build_mapc_cmd(struct its_cmd_block *cmd, 
	return desc->its_mapc_cmd.col;

}



static struct its_collection *its_build_mapvi_cmd(struct its_cmd_block *cmd,

static struct its_collection *its_build_mapti_cmd(struct its_cmd_block *cmd,

						  struct its_cmd_desc *desc)

{

	struct its_collection *col;



	col = dev_event_to_col(desc->its_mapvi_cmd.dev,

			       desc->its_mapvi_cmd.event_id);

	col = dev_event_to_col(desc->its_mapti_cmd.dev,

			       desc->its_mapti_cmd.event_id);



	its_encode_cmd(cmd, GITS_CMD_MAPVI);

	its_encode_devid(cmd, desc->its_mapvi_cmd.dev->device_id);

	its_encode_event_id(cmd, desc->its_mapvi_cmd.event_id);

	its_encode_phys_id(cmd, desc->its_mapvi_cmd.phys_id);

	its_encode_cmd(cmd, GITS_CMD_MAPTI);

	its_encode_devid(cmd, desc->its_mapti_cmd.dev->device_id);

	its_encode_event_id(cmd, desc->its_mapti_cmd.event_id);

	its_encode_phys_id(cmd, desc->its_mapti_cmd.phys_id);

	its_encode_collection(cmd, col->col_id);



	its_fixup_cmd(cmd);
@@ -529,15 +529,15 @@ static void its_send_mapc(struct its_node *its, struct its_collection *col, 
	its_send_single_command(its, its_build_mapc_cmd, &desc);

}



static void its_send_mapvi(struct its_device *dev, u32 irq_id, u32 id)

static void its_send_mapti(struct its_device *dev, u32 irq_id, u32 id)

{

	struct its_cmd_desc desc;



	desc.its_mapvi_cmd.dev = dev;

	desc.its_mapvi_cmd.phys_id = irq_id;

	desc.its_mapvi_cmd.event_id = id;

	desc.its_mapti_cmd.dev = dev;

	desc.its_mapti_cmd.phys_id = irq_id;

	desc.its_mapti_cmd.event_id = id;



	its_send_single_command(dev->its, its_build_mapvi_cmd, &desc);

	its_send_single_command(dev->its, its_build_mapti_cmd, &desc);

}



static void its_send_movi(struct its_device *dev,
@@ -1496,7 +1496,7 @@ static void its_irq_domain_activate(struct irq_domain *domain, 
	its_dev->event_map.col_map[event] = cpumask_first(cpu_mask);



	/* Map the GIC IRQ and event to the device */

	its_send_mapvi(its_dev, d->hwirq, event);

	its_send_mapti(its_dev, d->hwirq, event);

}



static void its_irq_domain_deactivate(struct irq_domain *domain,

include/linux/irqchip/arm-gic-v3.h

+0 −2
Original line number Diff line number Diff line
@@ -320,8 +320,6 @@ 
#define GITS_CMD_MAPD			0x08

#define GITS_CMD_MAPC			0x09

#define GITS_CMD_MAPTI			0x0a

/* older GIC documentation used MAPVI for this command */

#define GITS_CMD_MAPVI			GITS_CMD_MAPTI

#define GITS_CMD_MAPI			0x0b

#define GITS_CMD_MOVI			0x01

#define GITS_CMD_DISCARD		0x0f

CRA Git | Maintained and supported by SUSTech CRA and CCSE