Commit af2e650b authored by Tomer Tayar's avatar Tomer Tayar Committed by Oded Gabbay

habanalabs: add a value field to hl_fw_send_pci_access_msg()

For gaudi2 we need to send a value to F/W as part of the
PCI_ACCESS packet.
As a preparation, modify hl_fw_send_pci_access_msg() to have a 'value'
field.
Signed-off-by: default avatarTomer Tayar <ttayar@habana.ai>
Reviewed-by: default avatarOded Gabbay <ogabbay@kernel.org>
Signed-off-by: default avatarOded Gabbay <ogabbay@kernel.org>
parent 20cd88a7
...@@ -1259,8 +1259,7 @@ static void handle_reset_trigger(struct hl_device *hdev, u32 flags) ...@@ -1259,8 +1259,7 @@ static void handle_reset_trigger(struct hl_device *hdev, u32 flags)
* of heartbeat, the device CPU is marked as disable * of heartbeat, the device CPU is marked as disable
* so this message won't be sent * so this message won't be sent
*/ */
if (hl_fw_send_pci_access_msg(hdev, if (hl_fw_send_pci_access_msg(hdev, CPUCP_PACKET_DISABLE_PCI_ACCESS, 0x0))
CPUCP_PACKET_DISABLE_PCI_ACCESS))
dev_warn(hdev->dev, dev_warn(hdev->dev,
"Failed to disable PCI access by F/W\n"); "Failed to disable PCI access by F/W\n");
} }
...@@ -2054,7 +2053,7 @@ void hl_device_fini(struct hl_device *hdev) ...@@ -2054,7 +2053,7 @@ void hl_device_fini(struct hl_device *hdev)
* message won't be send. Also, in case of heartbeat, the device CPU is * message won't be send. Also, in case of heartbeat, the device CPU is
* marked as disable so this message won't be sent * marked as disable so this message won't be sent
*/ */
hl_fw_send_pci_access_msg(hdev, CPUCP_PACKET_DISABLE_PCI_ACCESS); hl_fw_send_pci_access_msg(hdev, CPUCP_PACKET_DISABLE_PCI_ACCESS, 0x0);
/* Mark device as disabled */ /* Mark device as disabled */
hdev->disabled = true; hdev->disabled = true;
......
...@@ -242,14 +242,14 @@ int hl_fw_load_fw_to_device(struct hl_device *hdev, const char *fw_name, ...@@ -242,14 +242,14 @@ int hl_fw_load_fw_to_device(struct hl_device *hdev, const char *fw_name,
return rc; return rc;
} }
int hl_fw_send_pci_access_msg(struct hl_device *hdev, u32 opcode) int hl_fw_send_pci_access_msg(struct hl_device *hdev, u32 opcode, u64 value)
{ {
struct cpucp_packet pkt = {}; struct cpucp_packet pkt = {};
pkt.ctl = cpu_to_le32(opcode << CPUCP_PKT_CTL_OPCODE_SHIFT); pkt.ctl = cpu_to_le32(opcode << CPUCP_PKT_CTL_OPCODE_SHIFT);
pkt.value = cpu_to_le64(value);
return hdev->asic_funcs->send_cpu_message(hdev, (u32 *) &pkt, return hdev->asic_funcs->send_cpu_message(hdev, (u32 *) &pkt, sizeof(pkt), 0, NULL);
sizeof(pkt), 0, NULL);
} }
int hl_fw_send_cpu_message(struct hl_device *hdev, u32 hw_queue_id, u32 *msg, int hl_fw_send_cpu_message(struct hl_device *hdev, u32 hw_queue_id, u32 *msg,
......
...@@ -3631,7 +3631,7 @@ bool hl_is_dram_va(struct hl_device *hdev, u64 virt_addr); ...@@ -3631,7 +3631,7 @@ bool hl_is_dram_va(struct hl_device *hdev, u64 virt_addr);
int hl_fw_load_fw_to_device(struct hl_device *hdev, const char *fw_name, int hl_fw_load_fw_to_device(struct hl_device *hdev, const char *fw_name,
void __iomem *dst, u32 src_offset, u32 size); void __iomem *dst, u32 src_offset, u32 size);
int hl_fw_send_pci_access_msg(struct hl_device *hdev, u32 opcode); int hl_fw_send_pci_access_msg(struct hl_device *hdev, u32 opcode, u64 value);
int hl_fw_send_cpu_message(struct hl_device *hdev, u32 hw_queue_id, u32 *msg, int hl_fw_send_cpu_message(struct hl_device *hdev, u32 hw_queue_id, u32 *msg,
u16 len, u32 timeout, u64 *result); u16 len, u32 timeout, u64 *result);
int hl_fw_unmask_irq(struct hl_device *hdev, u16 event_type); int hl_fw_unmask_irq(struct hl_device *hdev, u16 event_type);
......
...@@ -1632,7 +1632,7 @@ static int gaudi_late_init(struct hl_device *hdev) ...@@ -1632,7 +1632,7 @@ static int gaudi_late_init(struct hl_device *hdev)
gaudi->hw_cap_initialized &= ~(HW_CAP_NIC0 | HW_CAP_NIC1); gaudi->hw_cap_initialized &= ~(HW_CAP_NIC0 | HW_CAP_NIC1);
} }
rc = hl_fw_send_pci_access_msg(hdev, CPUCP_PACKET_ENABLE_PCI_ACCESS); rc = hl_fw_send_pci_access_msg(hdev, CPUCP_PACKET_ENABLE_PCI_ACCESS, 0x0);
if (rc) { if (rc) {
dev_err(hdev->dev, "Failed to enable PCI access from CPU\n"); dev_err(hdev->dev, "Failed to enable PCI access from CPU\n");
return rc; return rc;
...@@ -1677,7 +1677,7 @@ static int gaudi_late_init(struct hl_device *hdev) ...@@ -1677,7 +1677,7 @@ static int gaudi_late_init(struct hl_device *hdev)
return 0; return 0;
disable_pci_access: disable_pci_access:
hl_fw_send_pci_access_msg(hdev, CPUCP_PACKET_DISABLE_PCI_ACCESS); hl_fw_send_pci_access_msg(hdev, CPUCP_PACKET_DISABLE_PCI_ACCESS, 0x0);
return rc; return rc;
} }
...@@ -4236,7 +4236,7 @@ static int gaudi_suspend(struct hl_device *hdev) ...@@ -4236,7 +4236,7 @@ static int gaudi_suspend(struct hl_device *hdev)
{ {
int rc; int rc;
rc = hl_fw_send_pci_access_msg(hdev, CPUCP_PACKET_DISABLE_PCI_ACCESS); rc = hl_fw_send_pci_access_msg(hdev, CPUCP_PACKET_DISABLE_PCI_ACCESS, 0x0);
if (rc) if (rc)
dev_err(hdev->dev, "Failed to disable PCI access from CPU\n"); dev_err(hdev->dev, "Failed to disable PCI access from CPU\n");
......
...@@ -2675,7 +2675,7 @@ static int gaudi2_late_init(struct hl_device *hdev) ...@@ -2675,7 +2675,7 @@ static int gaudi2_late_init(struct hl_device *hdev)
{ {
int rc; int rc;
rc = hl_fw_send_pci_access_msg(hdev, CPUCP_PACKET_ENABLE_PCI_ACCESS); rc = hl_fw_send_pci_access_msg(hdev, CPUCP_PACKET_ENABLE_PCI_ACCESS, 0x0);
if (rc) { if (rc) {
dev_err(hdev->dev, "Failed to enable PCI access from CPU\n"); dev_err(hdev->dev, "Failed to enable PCI access from CPU\n");
return rc; return rc;
...@@ -2694,7 +2694,7 @@ static int gaudi2_late_init(struct hl_device *hdev) ...@@ -2694,7 +2694,7 @@ static int gaudi2_late_init(struct hl_device *hdev)
return 0; return 0;
disable_pci_access: disable_pci_access:
hl_fw_send_pci_access_msg(hdev, CPUCP_PACKET_DISABLE_PCI_ACCESS); hl_fw_send_pci_access_msg(hdev, CPUCP_PACKET_DISABLE_PCI_ACCESS, 0x0);
return rc; return rc;
} }
...@@ -5323,7 +5323,7 @@ static int gaudi2_suspend(struct hl_device *hdev) ...@@ -5323,7 +5323,7 @@ static int gaudi2_suspend(struct hl_device *hdev)
{ {
int rc; int rc;
rc = hl_fw_send_pci_access_msg(hdev, CPUCP_PACKET_DISABLE_PCI_ACCESS); rc = hl_fw_send_pci_access_msg(hdev, CPUCP_PACKET_DISABLE_PCI_ACCESS, 0x0);
if (rc) if (rc)
dev_err(hdev->dev, "Failed to disable PCI access from CPU\n"); dev_err(hdev->dev, "Failed to disable PCI access from CPU\n");
......
...@@ -888,7 +888,7 @@ int goya_late_init(struct hl_device *hdev) ...@@ -888,7 +888,7 @@ int goya_late_init(struct hl_device *hdev)
*/ */
WREG32(mmMMU_LOG2_DDR_SIZE, ilog2(prop->dram_size)); WREG32(mmMMU_LOG2_DDR_SIZE, ilog2(prop->dram_size));
rc = hl_fw_send_pci_access_msg(hdev, CPUCP_PACKET_ENABLE_PCI_ACCESS); rc = hl_fw_send_pci_access_msg(hdev, CPUCP_PACKET_ENABLE_PCI_ACCESS, 0x0);
if (rc) { if (rc) {
dev_err(hdev->dev, dev_err(hdev->dev,
"Failed to enable PCI access from CPU %d\n", rc); "Failed to enable PCI access from CPU %d\n", rc);
...@@ -2878,7 +2878,7 @@ int goya_suspend(struct hl_device *hdev) ...@@ -2878,7 +2878,7 @@ int goya_suspend(struct hl_device *hdev)
{ {
int rc; int rc;
rc = hl_fw_send_pci_access_msg(hdev, CPUCP_PACKET_DISABLE_PCI_ACCESS); rc = hl_fw_send_pci_access_msg(hdev, CPUCP_PACKET_DISABLE_PCI_ACCESS, 0x0);
if (rc) if (rc)
dev_err(hdev->dev, "Failed to disable PCI access from CPU\n"); dev_err(hdev->dev, "Failed to disable PCI access from CPU\n");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment