Received: by 2002:a05:7208:9594:b0:7e:5202:c8b4 with SMTP id gs20csp1160394rbb; Mon, 26 Feb 2024 00:00:00 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCWjxivpqqbwYuv+pf98PbcnkAhjDgpirNzPKzrQvv55JBB9HiQhsVso8YzsidEkL06hJXl2j9zZkVptrSvp9OM01SZ+bhGHLMmHb8VZwg== X-Google-Smtp-Source: AGHT+IFuiUfYEJPC0LRwXc9mhlkouQa/S4EHI+B4yv9/WWmrmIQ0Q212kkPSTEnqIw/jWIYlMBAN X-Received: by 2002:a17:90a:d497:b0:299:11e4:619d with SMTP id s23-20020a17090ad49700b0029911e4619dmr4617610pju.33.1708934400040; Mon, 26 Feb 2024 00:00:00 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708934400; cv=pass; d=google.com; s=arc-20160816; b=MYWRFkwFIKTcFcQfQ3gkgB2/3HHr9NVvQ9h9ejAIycpu7aDQ3hvfjb2pSjXJ523DTQ /AAcLojNES4kwLN8uT+X2r9jBhvSSAY2HYAX1xqS13hKOnN3YqXRlT1XpDqrOmN0/zYe aSqeEfodb7iCOHqOPtnD6/9of1rATmOYh4HGyNuUzxktfJmjHgaSw5SkO8UeFg9rLSuF Uwq57BFd74XWTyoBuLfKxbS12zeoimwaueWhlDeqgg6Jql4h52JJ1zSwqix0Mn695EMF 3oEe/nMy5X0mxEwnhk2N+uB8TcGDFVHmj7Dy1xBMZJk4CG+m/aJ4Pi/tMMPSwb/tpZgn ToSQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=z2Y5ofRFP1ZI15QZoUPMcIxNvJYeT8F455ch+rToeAE=; fh=19IqlW0whlizo/KlMSSa2cOOWxQfL+qQEe+pcsZ5oHc=; b=MQdyjPW0oEUdV5+jFkh4LO3PRZrPQ1JlwM7sQwjV8bfKg+I4fVbcYWzAKz40/18URs vnnrdS/N7kFH5HnsRs2g9HEsyNuhBmN2h0YiyDwGXF1THiOnpZI2qZytL8JUbwQGefS2 9IsGecO0VtKKUsRNOAiywVksgbKk75NOsuZxV2E+iHbhRMP3QFzxe7foSo+SDGdx7Kgi /Hr7C6hj3160oxCkyfr1RrPFQ30cqrBg+Sw6YezSTJjRtGj/PdkRluN8n9rprO/RJZSR 6i9EbCjaoJL3TzuRQCtoWBTFDO+9dNJiusl+IhhxoJogvFutxv1PlGT3h08ustszx0bE 2B7A==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=NkvaB7ep; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-80708-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-80708-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id pt7-20020a17090b3d0700b0029ad1898413si255969pjb.134.2024.02.25.23.59.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Feb 2024 00:00:00 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-80708-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=NkvaB7ep; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-80708-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-80708-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id A26C02847D4 for ; Mon, 26 Feb 2024 07:57:50 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 8C6001D554; Mon, 26 Feb 2024 07:56:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="NkvaB7ep" Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A7AE41CA91 for ; Mon, 26 Feb 2024 07:56:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708934199; cv=none; b=tR7nKylSn8gQR+tZDEYtMNuUvfM5Wf/0YJwKynp5rPy53V2eOc7YBFYDUD+UAX2H6FaoAgT9dlr3gYKNHhjC1S2ogWxToQLPI/XRNzskeCqZuYoW5+skKCftqfW8HYFgBlPxef3q/+6WavrHi2yFQJnAr2dUo8siu+4KBtvEX3o= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708934199; c=relaxed/simple; bh=7XdcGmZNj1k6DExpdbc9NvMvOv0pQ+9MNUQsEGhjmcI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Vqv+2jZu63WynS2CD617kLRiyEdhMRwdPNtUAmA4DjlfxCYxtao2SjaRe9dZvuN0xNE4Wgyeol2p1STU2v+bWWAQ91UTS6DbbF05YaN+34ubHUlPM3hq2IgVRmT7f6oEjIw9Cb/Ov60NUj64zGasP5RRKaTljx0Uj0bNzyMng2s= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=NkvaB7ep; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id E11EBC433C7; Mon, 26 Feb 2024 07:56:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1708934199; bh=7XdcGmZNj1k6DExpdbc9NvMvOv0pQ+9MNUQsEGhjmcI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NkvaB7epOzkGg6ZLIEVHY1/ogvmzwZ53OSJnnA5us7C7/hGmDO/maAtcAV5IDsStL RosjIHdOEr5pTmoElxwwhA5DUpvcU+TmHFCXhQ5SBLeEJw1KK53DHxjHmqSD6yqOMM aya2qsm64esw3l/zZlIXiUu+wwmOO332rZNhbnmkyVdmmbL571xHaKHJFyNo1b2xuE gT/5JJm8Qy42JIIiGF7sw0K+DctEgILfWL3cOB017AoP+/KHxPyEM+ITOZtwMoe4l/ CWgEIGote6IkqOkO5EEhg+KqZQOyAKVvEBrr5LBsGeg/HlAhSEW0MzauGTY5bkPYpb YV+/7iLXPW3+w== From: Oded Gabbay To: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Carl Vanderlip Cc: Ohad Sharabi Subject: [PATCH 2/3] accel/habanalabs/gaudi2: drop support for never released firmware Date: Mon, 26 Feb 2024 09:56:25 +0200 Message-Id: <20240226075626.1222534-2-ogabbay@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240226075626.1222534-1-ogabbay@kernel.org> References: <20240226075626.1222534-1-ogabbay@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Ohad Sharabi Firmware files below 1.11 were never released to customers so no need to support them externally. Signed-off-by: Ohad Sharabi Reviewed-by: Oded Gabbay Signed-off-by: Oded Gabbay --- drivers/accel/habanalabs/gaudi2/gaudi2.c | 47 ++---------------------- 1 file changed, 3 insertions(+), 44 deletions(-) diff --git a/drivers/accel/habanalabs/gaudi2/gaudi2.c b/drivers/accel/habanalabs/gaudi2/gaudi2.c index 5be3432d29b3..c99edbf9f4ca 100644 --- a/drivers/accel/habanalabs/gaudi2/gaudi2.c +++ b/drivers/accel/habanalabs/gaudi2/gaudi2.c @@ -6314,26 +6314,6 @@ static void gaudi2_execute_hard_reset(struct hl_device *hdev) WREG32(mmPSOC_RESET_CONF_SW_ALL_RST, 1); } -static int gaudi2_get_soft_rst_done_indication(struct hl_device *hdev, u32 poll_timeout_us) -{ - int i, rc = 0; - u32 reg_val; - - for (i = 0 ; i < GAUDI2_RESET_POLL_CNT ; i++) - rc = hl_poll_timeout( - hdev, - mmCPU_RST_STATUS_TO_HOST, - reg_val, - reg_val == CPU_RST_STATUS_SOFT_RST_DONE, - 1000, - poll_timeout_us); - - if (rc) - dev_err(hdev->dev, "Timeout while waiting for FW to complete soft reset (0x%x)\n", - reg_val); - return rc; -} - /** * gaudi2_execute_soft_reset - execute soft reset by driver/FW * @@ -6346,23 +6326,8 @@ static int gaudi2_get_soft_rst_done_indication(struct hl_device *hdev, u32 poll_ static int gaudi2_execute_soft_reset(struct hl_device *hdev, bool driver_performs_reset, u32 poll_timeout_us) { - int rc; - - if (!driver_performs_reset) { - if (hl_is_fw_sw_ver_below(hdev, 1, 10)) { - /* set SP to indicate reset request sent to FW */ - WREG32(mmCPU_RST_STATUS_TO_HOST, CPU_RST_STATUS_NA); - - WREG32(mmGIC_HOST_SOFT_RST_IRQ_POLL_REG, - gaudi2_irq_map_table[GAUDI2_EVENT_CPU_SOFT_RESET].cpu_id); - - /* wait for f/w response */ - rc = gaudi2_get_soft_rst_done_indication(hdev, poll_timeout_us); - } else { - rc = hl_fw_send_soft_reset(hdev); - } - return rc; - } + if (!driver_performs_reset) + return hl_fw_send_soft_reset(hdev); /* Block access to engines, QMANs and SM during reset, these * RRs will be reconfigured after soft reset. @@ -8165,13 +8130,7 @@ static void gaudi2_ack_module_razwi_event_handler(struct hl_device *hdev, } hbw_rtr_id = gaudi2_tpc_initiator_hbw_rtr_id[module_idx]; - - if (hl_is_fw_sw_ver_below(hdev, 1, 9) && - !hdev->asic_prop.fw_security_enabled && - ((module_idx == 0) || (module_idx == 1))) - lbw_rtr_id = DCORE0_RTR0; - else - lbw_rtr_id = gaudi2_tpc_initiator_lbw_rtr_id[module_idx]; + lbw_rtr_id = gaudi2_tpc_initiator_lbw_rtr_id[module_idx]; break; case RAZWI_MME: sprintf(initiator_name, "MME_%u", module_idx); -- 2.34.1