Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 1DB5EC433FE for ; Mon, 7 Nov 2022 13:35:01 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 16F9F84DC3; Mon, 7 Nov 2022 14:34:58 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="e/vhV3wv"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 659A4806D5; Mon, 7 Nov 2022 14:34:53 +0100 (CET) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 1A8FA84EC7 for ; Mon, 7 Nov 2022 14:34:45 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: phobos.denx.de; spf=none smtp.mailfrom=jitloonl@ecsmtp.png.intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1667828086; x=1699364086; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=MG4GlG11lFexwMJd5+up7lljEG0gXdQBsavqqVJrq1k=; b=e/vhV3wvZI2mAJX5f591c6ZdzfzItwHBeBzFEM+NfZjBoV2Z67EDRBVD veKOd3kmzje7t9Zgv+LAxh1GVTKAEcMMRC+/giWx7kvE3PcHCDWqh+QI7 L+bmu/ERii+c5Ca0dbNumEoLyHCcXJVXVRRYp29nhuMMX8QalkM5NPne6 jrFe8hDrJzqwVUQIumC5p0VCSZbOwLX9jgiqQF51ndnP6jjcJVWbariIS scteBm45gaOZlDOeEs1aqiOKq+S95iNJU2yhJYU3UypvmZvXwN2DBoHyO bU6a+Pho00PmxzKXCh4h4ep6ZNfz0DrY/yqeJ/OggZV6oE9tGy0m9pftT w==; X-IronPort-AV: E=McAfee;i="6500,9779,10523"; a="310410263" X-IronPort-AV: E=Sophos;i="5.96,145,1665471600"; d="scan'208";a="310410263" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Nov 2022 05:34:30 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10523"; a="669136194" X-IronPort-AV: E=Sophos;i="5.96,145,1665471600"; d="scan'208";a="669136194" Received: from pglmail07.png.intel.com ([10.221.193.207]) by orsmga001.jf.intel.com with ESMTP; 07 Nov 2022 05:34:25 -0800 Received: from localhost (pgli0028.png.intel.com [10.221.84.177]) by pglmail07.png.intel.com (Postfix) with ESMTP id EE32E4837; Mon, 7 Nov 2022 21:34:24 +0800 (+08) Received: by localhost (Postfix, from userid 12048045) id BFE9DE00214; Mon, 7 Nov 2022 21:34:24 +0800 (+08) From: Jit Loon Lim To: u-boot@lists.denx.de Cc: Jagan Teki , Vignesh R , Marek , Simon , Tien Fong , Kok Kiang , Siew Chin , Sin Hui , Raaj , Dinesh , Boon Khai , Alif , Teik Heng , Hazim , Jit Loon Lim , Sieu Mun Tang , Chew@ecsmtp.png.intel.com Subject: [PATCH 3/3] drivers: fpga: intel_pr: enable illegal request detection Date: Mon, 7 Nov 2022 21:33:51 +0800 Message-Id: <20221107133351.26311-3-jit.loon.lim@intel.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20221107133351.26311-1-jit.loon.lim@intel.com> References: <20221107133351.26311-1-jit.loon.lim@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean From: "Chew, Chiau Ee" This is to enable check on the freeze_illegal_request register whereby high on any bit of this bus indicates a read or write issue by a static region master when an freeze bridge is in the freeze state. In the case if any of the bit is high, write 1 to first clear the bit and then return with error. Signed-off-by: Chew, Chiau Ee Signed-off-by: Jit Loon Lim --- drivers/fpga/intel_pr.c | 54 ++++++++++++++++++++++++++++++++++------- 1 file changed, 45 insertions(+), 9 deletions(-) diff --git a/drivers/fpga/intel_pr.c b/drivers/fpga/intel_pr.c index a0a758488b..e84845c918 100644 --- a/drivers/fpga/intel_pr.c +++ b/drivers/fpga/intel_pr.c @@ -62,6 +62,49 @@ static int intel_get_freeze_br_addr(fdt_addr_t *addr, unsigned int region) return ret; } +static int intel_freeze_br_req_ack(fdt_addr_t addr, u32 req_ack) +{ + u32 status, illegal, ctrl; + int ret = -ETIMEDOUT; + unsigned long start = get_timer(0); + + while (1) { + illegal = readl(addr + FREEZE_CSR_ILLEGAL_REQ_OFFSET); + if (illegal) { + printf("illegal request 0x%08x detected in freeze bridge\n", illegal); + + writel(illegal, addr + FREEZE_CSR_ILLEGAL_REQ_OFFSET); + + illegal = readl(addr + FREEZE_CSR_ILLEGAL_REQ_OFFSET); + if (illegal) + printf("illegal request 0x%08x detected in freeze bridge are not cleared\n", + illegal); + + ret = -EINVAL; + break; + } + + status = readl(addr + FREEZE_CSR_STATUS_OFFSET); + status &= req_ack; + if (status) { + ctrl = readl(addr + FREEZE_CSR_CTRL_OFFSET); + printf("%s request %x acknowledged %x %x\n", + __func__, req_ack, status, ctrl); + + ret = 0; + break; + } + + if (get_timer(start) > FREEZE_TIMEOUT) + break; + + udelay(1); + WATCHDOG_RESET(); + } + + return ret; +} + static int intel_freeze_br_do_freeze(unsigned int region) { u32 status; @@ -81,11 +124,7 @@ static int intel_freeze_br_do_freeze(unsigned int region) writel(FREEZE_CSR_CTRL_FREEZE_REQ, addr + FREEZE_CSR_CTRL_OFFSET); - ret = wait_for_bit_le32((const u32 *)(addr + - FREEZE_CSR_STATUS_OFFSET), - FREEZE_CSR_STATUS_FREEZE_REQ_DONE, true, - FREEZE_TIMEOUT, false); - + ret = intel_freeze_br_req_ack(addr, FREEZE_CSR_STATUS_FREEZE_REQ_DONE); if (ret) writel(0, addr + FREEZE_CSR_CTRL_OFFSET); else @@ -115,10 +154,7 @@ static int intel_freeze_br_do_unfreeze(unsigned int region) writel(FREEZE_CSR_CTRL_UNFREEZE_REQ, addr + FREEZE_CSR_CTRL_OFFSET); - ret = wait_for_bit_le32((const u32 *)(addr + - FREEZE_CSR_STATUS_OFFSET), - FREEZE_CSR_STATUS_UNFREEZE_REQ_DONE, true, - FREEZE_TIMEOUT, false); + ret = intel_freeze_br_req_ack(addr, FREEZE_CSR_STATUS_UNFREEZE_REQ_DONE); writel(0, addr + FREEZE_CSR_CTRL_OFFSET); -- 2.26.2