Received: by 2002:a05:7412:2a8c:b0:e2:908c:2ebd with SMTP id u12csp1725393rdh; Tue, 26 Sep 2023 01:17:42 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFRn9UbuzZrd4R2NUDd+1PovuLdKHRbaKhjuGXsd+o4E9vf6a03hRcYOTSZpa1s9qfrAl1m X-Received: by 2002:a1f:c945:0:b0:496:b3e6:e107 with SMTP id z66-20020a1fc945000000b00496b3e6e107mr4977319vkf.1.1695716262113; Tue, 26 Sep 2023 01:17:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695716262; cv=none; d=google.com; s=arc-20160816; b=drr5dN2yKyU955rW7ARriNHOZvetn0L5pf+kVKAmIxyGDBEdpJS5Hef3l4OU6jTxNA H/F6nEwzgUiK2Wz5J9fZqNC4peDwo8Mix6TBP80kjQNLKgAAEEAU+WuzZKHPoGUyJOzS Atfw8SX8bq06wYucj6zTeJI8/R423/buIX5sz2DsMC5DOfXG1v0az5InzeRKe6vJsD0q BToBuDta59GVtkkvJrXmMtUJv6K2PgI7mSFNtw1RjaViANOSQi+ihwstBXUCaUGSjW0Q YvqOrJSJlaP14YFnLgrENic/OCEimfzbJB/BqlM9E3Ug9nD66HqTJU0CQYsos1ZYP7LR GhCg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=ULbShhiSvJvHWDVAlqykfeim8L9l1C+Am0hEpBtLcAI=; fh=6ne5PYsUndaVo3O8h6/bKF93b8ZMgpw+0UfKknNxXHs=; b=X+Z6wHT5FvcvP0MFV0C/cWe2/kU3mVkaden9OVKOseDjINvNjK21kIrEciwKIs75oi f0iBq5Zslqo3dFMhBtOKARf1C7rStVqZ3u68iG2WF/ChdCENO+IGjPVa5ZF9jrYEla+x vW5n9tI4v9blDU4qjSH8hKuE1GjlI4zUTosK/zMOjxDPFQdCkLJLkGCn9zlCPSRN4JLh 4nAyYIYE+2Dn/YWyYeJS7//YmWIF7GPiVKQMcxSPCjnSE5v/0LUskoNeOQUnVkk9M5SE oVlIABfEH7w1LPzfx+oj84M9/jFCMjBwpXlaWC7p2Wy4xh+U9yVcFELuoVgEaMWP7vDY W3UQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=NKwBwIkX; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from howler.vger.email (howler.vger.email. [23.128.96.34]) by mx.google.com with ESMTPS id f8-20020a056a001ac800b0068fb5ca50cdsi12686947pfv.126.2023.09.26.01.17.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Sep 2023 01:17:42 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) client-ip=23.128.96.34; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=NKwBwIkX; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id 360DC802EAD9; Tue, 26 Sep 2023 01:14:27 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233947AbjIZIOQ (ORCPT + 99 others); Tue, 26 Sep 2023 04:14:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44944 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233911AbjIZIOG (ORCPT ); Tue, 26 Sep 2023 04:14:06 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4579A97 for ; Tue, 26 Sep 2023 01:14:00 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 18B19C433CA; Tue, 26 Sep 2023 08:13:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1695716039; bh=Zj1LbCF+4qNSxbYeKTNC7s+VtkpmrrJmwaIr6viPOS0=; h=From:To:Subject:Date:In-Reply-To:References:From; b=NKwBwIkX+PbX7WRGiC1ezRUi5L+rofVbX4/U24pNvcZ2r9nDoOx+LTRwfW780fY9e OoiLolkibQYzcRwLH1E59VLwEI6Y5pTX7D+mPvNI/Ja9Wd45i1jOzfJTdeWF/R3SnX +iqWMcWfhlTdcHMtCIt9pf7QXDJwhWDHVNZR07JB9RsOqfWYEFPF9SYs8e1nSOGO0R xzHznsW/zcHX0kOrOugdpEueLZT54pcauYOlE8lT6178YtxXeJaX1BTlgvMWTWWKRJ ZkkIAnImLR+CbArfkFJn0SDEMcvnfe+4dCa/YsB9+bqEZwYl/oKSdmluQCymArjjQ7 wJNGz4pF0MM2w== From: Oded Gabbay To: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH 8/9] accel/habanalabs/gaudi: remove define used for simulator Date: Tue, 26 Sep 2023 11:13:44 +0300 Message-Id: <20230926081345.240927-8-ogabbay@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230926081345.240927-1-ogabbay@kernel.org> References: <20230926081345.240927-1-ogabbay@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Tue, 26 Sep 2023 01:14:27 -0700 (PDT) We don't support simulator in upstream. Signed-off-by: Oded Gabbay --- drivers/accel/habanalabs/common/habanalabs.h | 2 -- drivers/accel/habanalabs/gaudi/gaudi.c | 3 +-- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/accel/habanalabs/common/habanalabs.h b/drivers/accel/habanalabs/common/habanalabs.h index b1b1c51aa5b1..a8ccc04e7f92 100644 --- a/drivers/accel/habanalabs/common/habanalabs.h +++ b/drivers/accel/habanalabs/common/habanalabs.h @@ -85,8 +85,6 @@ struct hl_fpriv; #define HL_PCI_ELBI_TIMEOUT_MSEC 10 /* 10ms */ -#define HL_SIM_MAX_TIMEOUT_US 100000000 /* 100s */ - #define HL_INVALID_QUEUE UINT_MAX #define HL_COMMON_USER_CQ_INTERRUPT_ID 0xFFF diff --git a/drivers/accel/habanalabs/gaudi/gaudi.c b/drivers/accel/habanalabs/gaudi/gaudi.c index 31e04af46876..53292d4c15c8 100644 --- a/drivers/accel/habanalabs/gaudi/gaudi.c +++ b/drivers/accel/habanalabs/gaudi/gaudi.c @@ -4623,8 +4623,7 @@ static int gaudi_scrub_device_dram(struct hl_device *hdev, u64 val) static int gaudi_scrub_device_mem(struct hl_device *hdev) { struct asic_fixed_properties *prop = &hdev->asic_prop; - u64 wait_to_idle_time = hdev->pdev ? HBM_SCRUBBING_TIMEOUT_US : - min_t(u64, HBM_SCRUBBING_TIMEOUT_US * 10, HL_SIM_MAX_TIMEOUT_US); + u64 wait_to_idle_time = HBM_SCRUBBING_TIMEOUT_US; u64 addr, size, val = hdev->memory_scrub_val; ktime_t timeout; int rc = 0; -- 2.34.1