Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-26 12:52:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

accel/habanalabs: do soft-reset using cpucp packet

Browse Source 
This is done depending on the FW version. The cpucp method is
preferable and saves scratchpads resource.

Signed-off-by: Dafna Hirschfeld <dhirschfeld@habana.ai>
Reviewed-by: Oded Gabbay <ogabbay@kernel.org>
Signed-off-by: Oded Gabbay <ogabbay@kernel.org>
This commit is contained in:
Dafna Hirschfeld 2023-02-08 16:16:08 +02:00 committed by Oded Gabbay
parent a12428acf8
commit cc7b790d41
4 changed files with 34 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/accel/habanalabs/common/firmware_if.c
View File

@ -591,6 +591,20 @@ void hl_fw_cpu_accessible_dma_pool_free(struct hl_device *hdev, size_t size,
size); size);
} }
int hl_fw_send_soft_reset(struct hl_device *hdev)
{
struct cpucp_packet pkt;
int rc;
memset(&pkt, 0, sizeof(pkt));
pkt.ctl = cpu_to_le32(CPUCP_PACKET_SOFT_RESET << CPUCP_PKT_CTL_OPCODE_SHIFT);
rc = hdev->asic_funcs->send_cpu_message(hdev, (u32 *) &pkt, sizeof(pkt), 0, NULL);
if (rc)
dev_err(hdev->dev, "failed to send soft-reset msg (err = %d)\n", rc);
return rc;
}
int hl_fw_send_device_activity(struct hl_device *hdev, bool open) int hl_fw_send_device_activity(struct hl_device *hdev, bool open)
{ {
struct cpucp_packet pkt; struct cpucp_packet pkt;

1
drivers/accel/habanalabs/common/habanalabs.h
View File

@ -3884,6 +3884,7 @@ int hl_fw_dram_replaced_row_get(struct hl_device *hdev,
int hl_fw_dram_pending_row_get(struct hl_device *hdev, u32 *pend_rows_num); int hl_fw_dram_pending_row_get(struct hl_device *hdev, u32 *pend_rows_num);
int hl_fw_cpucp_engine_core_asid_set(struct hl_device *hdev, u32 asid); int hl_fw_cpucp_engine_core_asid_set(struct hl_device *hdev, u32 asid);
int hl_fw_send_device_activity(struct hl_device *hdev, bool open); int hl_fw_send_device_activity(struct hl_device *hdev, bool open);
int hl_fw_send_soft_reset(struct hl_device *hdev);
int hl_pci_bars_map(struct hl_device *hdev, const char * const name[3], int hl_pci_bars_map(struct hl_device *hdev, const char * const name[3],
bool is_wc[3]); bool is_wc[3]);
int hl_pci_elbi_read(struct hl_device *hdev, u64 addr, u32 *data); int hl_pci_elbi_read(struct hl_device *hdev, u64 addr, u32 *data);

24
drivers/accel/habanalabs/gaudi2/gaudi2.c
View File

@ -6148,18 +6148,24 @@ static int gaudi2_execute_soft_reset(struct hl_device *hdev, bool driver_perform
u32 poll_timeout_us) u32 poll_timeout_us)
{ {
struct cpu_dyn_regs *dyn_regs = &hdev->fw_loader.dynamic_loader.comm_desc.cpu_dyn_regs; struct cpu_dyn_regs *dyn_regs = &hdev->fw_loader.dynamic_loader.comm_desc.cpu_dyn_regs;
int rc = 0;
if (!driver_performs_reset) { if (!driver_performs_reset) {
/* set SP to indicate reset request sent to FW */ if (hl_is_fw_sw_ver_below(hdev, 1, 10)) {
if (dyn_regs->cpu_rst_status) /* set SP to indicate reset request sent to FW */
WREG32(le32_to_cpu(dyn_regs->cpu_rst_status), CPU_RST_STATUS_NA); if (dyn_regs->cpu_rst_status)
else WREG32(le32_to_cpu(dyn_regs->cpu_rst_status), CPU_RST_STATUS_NA);
WREG32(mmCPU_RST_STATUS_TO_HOST, CPU_RST_STATUS_NA); else
WREG32(mmCPU_RST_STATUS_TO_HOST, CPU_RST_STATUS_NA);
WREG32(le32_to_cpu(dyn_regs->gic_host_soft_rst_irq),
gaudi2_irq_map_table[GAUDI2_EVENT_CPU_SOFT_RESET].cpu_id);
WREG32(le32_to_cpu(dyn_regs->gic_host_soft_rst_irq), /* wait for f/w response */
gaudi2_irq_map_table[GAUDI2_EVENT_CPU_SOFT_RESET].cpu_id); rc = gaudi2_get_soft_rst_done_indication(hdev, poll_timeout_us);
} else {
return gaudi2_get_soft_rst_done_indication(hdev, poll_timeout_us); rc = hl_fw_send_soft_reset(hdev);
}
return rc;
} }
/* Block access to engines, QMANs and SM during reset, these /* Block access to engines, QMANs and SM during reset, these

4
drivers/accel/habanalabs/include/common/cpucp_if.h
View File

@ -665,6 +665,9 @@ enum pq_init_status {
* *
* CPUCP_PACKET_REGISTER_INTERRUPTS - * CPUCP_PACKET_REGISTER_INTERRUPTS -
* Packet to register interrupts indicating LKD is ready to receive events from FW. * Packet to register interrupts indicating LKD is ready to receive events from FW.
*
* CPUCP_PACKET_SOFT_RESET -
* Packet to perform soft-reset.
*/ */
enum cpucp_packet_id { enum cpucp_packet_id {
@ -731,6 +734,7 @@ enum cpucp_packet_id {
CPUCP_PACKET_RESERVED11, /* not used */ CPUCP_PACKET_RESERVED11, /* not used */
CPUCP_PACKET_RESERVED12, /* internal */ CPUCP_PACKET_RESERVED12, /* internal */
CPUCP_PACKET_REGISTER_INTERRUPTS, /* internal */ CPUCP_PACKET_REGISTER_INTERRUPTS, /* internal */
CPUCP_PACKET_SOFT_RESET, /* internal */
CPUCP_PACKET_ID_MAX /* must be last */ CPUCP_PACKET_ID_MAX /* must be last */
}; };