Commit f8b0f2ec authored by Ofir Bitton's avatar Ofir Bitton Committed by Oded Gabbay
Browse files

habanalabs/gaudi: remove duplicated gaudi packets masks 



As all packets use the same CTL register masks, we remove duplicated
masks and use common masks instead.

Signed-off-by: default avatarOfir Bitton <obitton@habana.ai>
Reviewed-by: default avatarOded Gabbay <ogabbay@kernel.org>
Signed-off-by: default avatarOded Gabbay <ogabbay@kernel.org>
parent c209e742

drivers/misc/habanalabs/gaudi/gaudi.c

+16 −16
Original line number Diff line number Diff line
@@ -7922,10 +7922,10 @@ static u32 gaudi_gen_signal_cb(struct hl_device *hdev, void *data, u16 sob_id, 
	ctl = FIELD_PREP(GAUDI_PKT_SHORT_CTL_ADDR_MASK, sob_id * 4);

	ctl |= FIELD_PREP(GAUDI_PKT_SHORT_CTL_OP_MASK, 0); /* write the value */

	ctl |= FIELD_PREP(GAUDI_PKT_SHORT_CTL_BASE_MASK, 3); /* W_S SOB base */

	ctl |= FIELD_PREP(GAUDI_PKT_SHORT_CTL_OPCODE_MASK, PACKET_MSG_SHORT);

	ctl |= FIELD_PREP(GAUDI_PKT_SHORT_CTL_EB_MASK, eb);

	ctl |= FIELD_PREP(GAUDI_PKT_SHORT_CTL_RB_MASK, 1);

	ctl |= FIELD_PREP(GAUDI_PKT_SHORT_CTL_MB_MASK, 1);

	ctl |= FIELD_PREP(GAUDI_PKT_CTL_OPCODE_MASK, PACKET_MSG_SHORT);

	ctl |= FIELD_PREP(GAUDI_PKT_CTL_EB_MASK, eb);

	ctl |= FIELD_PREP(GAUDI_PKT_CTL_RB_MASK, 1);

	ctl |= FIELD_PREP(GAUDI_PKT_CTL_MB_MASK, 1);



	pkt->value = cpu_to_le32(value);

	pkt->ctl = cpu_to_le32(ctl);
@@ -7942,10 +7942,10 @@ static u32 gaudi_add_mon_msg_short(struct packet_msg_short *pkt, u32 value, 


	ctl = FIELD_PREP(GAUDI_PKT_SHORT_CTL_ADDR_MASK, addr);

	ctl |= FIELD_PREP(GAUDI_PKT_SHORT_CTL_BASE_MASK, 2);  /* W_S MON base */

	ctl |= FIELD_PREP(GAUDI_PKT_SHORT_CTL_OPCODE_MASK, PACKET_MSG_SHORT);

	ctl |= FIELD_PREP(GAUDI_PKT_SHORT_CTL_EB_MASK, 0);

	ctl |= FIELD_PREP(GAUDI_PKT_SHORT_CTL_RB_MASK, 1);

	ctl |= FIELD_PREP(GAUDI_PKT_SHORT_CTL_MB_MASK, 0); /* last pkt MB */

	ctl |= FIELD_PREP(GAUDI_PKT_CTL_OPCODE_MASK, PACKET_MSG_SHORT);

	ctl |= FIELD_PREP(GAUDI_PKT_CTL_EB_MASK, 0);

	ctl |= FIELD_PREP(GAUDI_PKT_CTL_RB_MASK, 1);

	ctl |= FIELD_PREP(GAUDI_PKT_CTL_MB_MASK, 0); /* last pkt MB */



	pkt->value = cpu_to_le32(value);

	pkt->ctl = cpu_to_le32(ctl);
@@ -7991,10 +7991,10 @@ static u32 gaudi_add_arm_monitor_pkt(struct hl_device *hdev, 
	ctl = FIELD_PREP(GAUDI_PKT_SHORT_CTL_ADDR_MASK, msg_addr_offset);

	ctl |= FIELD_PREP(GAUDI_PKT_SHORT_CTL_OP_MASK, 0); /* write the value */

	ctl |= FIELD_PREP(GAUDI_PKT_SHORT_CTL_BASE_MASK, 2); /* W_S MON base */

	ctl |= FIELD_PREP(GAUDI_PKT_SHORT_CTL_OPCODE_MASK, PACKET_MSG_SHORT);

	ctl |= FIELD_PREP(GAUDI_PKT_SHORT_CTL_EB_MASK, 0);

	ctl |= FIELD_PREP(GAUDI_PKT_SHORT_CTL_RB_MASK, 1);

	ctl |= FIELD_PREP(GAUDI_PKT_SHORT_CTL_MB_MASK, 1);

	ctl |= FIELD_PREP(GAUDI_PKT_CTL_OPCODE_MASK, PACKET_MSG_SHORT);

	ctl |= FIELD_PREP(GAUDI_PKT_CTL_EB_MASK, 0);

	ctl |= FIELD_PREP(GAUDI_PKT_CTL_RB_MASK, 1);

	ctl |= FIELD_PREP(GAUDI_PKT_CTL_MB_MASK, 1);



	pkt->value = cpu_to_le32(value);

	pkt->ctl = cpu_to_le32(ctl);
@@ -8012,10 +8012,10 @@ static u32 gaudi_add_fence_pkt(struct packet_fence *pkt) 
	cfg |= FIELD_PREP(GAUDI_PKT_FENCE_CFG_TARGET_VAL_MASK, 1);

	cfg |= FIELD_PREP(GAUDI_PKT_FENCE_CFG_ID_MASK, 2);



	ctl = FIELD_PREP(GAUDI_PKT_FENCE_CTL_OPCODE_MASK, PACKET_FENCE);

	ctl |= FIELD_PREP(GAUDI_PKT_SHORT_CTL_EB_MASK, 0);

	ctl |= FIELD_PREP(GAUDI_PKT_SHORT_CTL_RB_MASK, 1);

	ctl |= FIELD_PREP(GAUDI_PKT_SHORT_CTL_MB_MASK, 1);

	ctl = FIELD_PREP(GAUDI_PKT_CTL_OPCODE_MASK, PACKET_FENCE);

	ctl |= FIELD_PREP(GAUDI_PKT_CTL_EB_MASK, 0);

	ctl |= FIELD_PREP(GAUDI_PKT_CTL_RB_MASK, 1);

	ctl |= FIELD_PREP(GAUDI_PKT_CTL_MB_MASK, 1);



	pkt->cfg = cpu_to_le32(cfg);

	pkt->ctl = cpu_to_le32(ctl);

drivers/misc/habanalabs/include/gaudi/gaudi_packets.h

+0 −24
Original line number Diff line number Diff line
@@ -111,18 +111,6 @@ struct packet_msg_long { 
#define GAUDI_PKT_SHORT_CTL_BASE_SHIFT		22

#define GAUDI_PKT_SHORT_CTL_BASE_MASK		0x00C00000



#define GAUDI_PKT_SHORT_CTL_OPCODE_SHIFT	24

#define GAUDI_PKT_SHORT_CTL_OPCODE_MASK		0x1F000000



#define GAUDI_PKT_SHORT_CTL_EB_SHIFT		29

#define GAUDI_PKT_SHORT_CTL_EB_MASK		0x20000000



#define GAUDI_PKT_SHORT_CTL_RB_SHIFT		30

#define GAUDI_PKT_SHORT_CTL_RB_MASK		0x40000000



#define GAUDI_PKT_SHORT_CTL_MB_SHIFT		31

#define GAUDI_PKT_SHORT_CTL_MB_MASK		0x80000000



struct packet_msg_short {

	__le32 value;

	__le32 ctl;
@@ -146,18 +134,6 @@ struct packet_msg_prot { 
#define GAUDI_PKT_FENCE_CTL_PRED_SHIFT		0

#define GAUDI_PKT_FENCE_CTL_PRED_MASK		0x0000001F



#define GAUDI_PKT_FENCE_CTL_OPCODE_SHIFT	24

#define GAUDI_PKT_FENCE_CTL_OPCODE_MASK		0x1F000000



#define GAUDI_PKT_FENCE_CTL_EB_SHIFT		29

#define GAUDI_PKT_FENCE_CTL_EB_MASK		0x20000000



#define GAUDI_PKT_FENCE_CTL_RB_SHIFT		30

#define GAUDI_PKT_FENCE_CTL_RB_MASK		0x40000000



#define GAUDI_PKT_FENCE_CTL_MB_SHIFT		31

#define GAUDI_PKT_FENCE_CTL_MB_MASK		0x80000000



struct packet_fence {

	__le32 cfg;

	__le32 ctl;