From patchwork Mon Nov 13 11:06:42 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Neuling X-Patchwork-Id: 837419 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3yb7Cv3WSBz9sRV for ; Mon, 13 Nov 2017 22:08:11 +1100 (AEDT) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3yb7Cv2kVWzDqjr for ; Mon, 13 Nov 2017 22:08:11 +1100 (AEDT) X-Original-To: skiboot@lists.ozlabs.org Delivered-To: skiboot@lists.ozlabs.org Received: from ozlabs.org (ozlabs.org [IPv6:2401:3900:2:1::2]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3yb7BW1cXVzDqjs for ; Mon, 13 Nov 2017 22:06:59 +1100 (AEDT) Received: from localhost.localdomain (localhost [127.0.0.1]) by ozlabs.org (Postfix) with ESMTP id 3yb7BV0rF8z9sxR; Mon, 13 Nov 2017 22:06:58 +1100 (AEDT) Received: by localhost.localdomain (Postfix, from userid 1000) id EB32EEEA9EE; Mon, 13 Nov 2017 22:06:57 +1100 (AEDT) From: Michael Neuling To: stewart@linux.vnet.ibm.com Date: Mon, 13 Nov 2017 22:06:42 +1100 Message-Id: <20171113110644.15478-3-mikey@neuling.org> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20171113110644.15478-1-mikey@neuling.org> References: <20171113110644.15478-1-mikey@neuling.org> Subject: [Skiboot] [PATCH 3/5] npu2: MCD refactor X-BeenThere: skiboot@lists.ozlabs.org X-Mailman-Version: 2.1.24 Precedence: list List-Id: Mailing list for skiboot development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: skiboot@lists.ozlabs.org, mikey@neuling.org, Reza Arbab , alistair@popple.id.au MIME-Version: 1.0 Errors-To: skiboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Skiboot" Pull out MCD writing code into npu2_mcd_init() No functional change. Signed-off-by: Michael Neuling Acked-by: Balbir Singh --- hw/npu2.c | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/hw/npu2.c b/hw/npu2.c index 9f2aaad45e..79ebaff75f 100644 --- a/hw/npu2.c +++ b/hw/npu2.c @@ -849,21 +849,10 @@ static void npu2_write_mcd(struct npu2 *p, uint64_t pcb_addr, uint64_t addr, xscom_write(p->chip_id, pcb_addr, val); } -static void npu2_hw_init(struct npu2 *p) +static void npu2_mcd_init(struct npu2 *p) { int i; - uint64_t val, size, addr, gpu_min_addr, gpu_max_addr, total_size; - - npu2_ioda_reset(&p->phb, false); - - /* Enable XTS retry mode */ - val = npu2_read(p, NPU2_XTS_CFG); - npu2_write(p, NPU2_XTS_CFG, val | NPU2_XTS_CFG_MMIOSD | NPU2_XTS_CFG_TRY_ATR_RO); - - if (!is_p9dd1()) { - val = npu2_read(p, NPU2_XTS_CFG2); - npu2_write(p, NPU2_XTS_CFG2, val | NPU2_XTS_CFG2_NO_FLUSH_ENA); - } + uint64_t size, addr, gpu_min_addr, gpu_max_addr, total_size; /* Init memory cache directory (MCD) registers. */ phys_map_get(p->chip_id, GPU_MEM, NPU2_LINKS_PER_CHIP - 1, @@ -901,6 +890,24 @@ static void npu2_hw_init(struct npu2 *p) } } +static void npu2_hw_init(struct npu2 *p) +{ + uint64_t val; + + npu2_ioda_reset(&p->phb, false); + + /* Enable XTS retry mode */ + val = npu2_read(p, NPU2_XTS_CFG); + npu2_write(p, NPU2_XTS_CFG, val | NPU2_XTS_CFG_MMIOSD | NPU2_XTS_CFG_TRY_ATR_RO); + + if (!is_p9dd1()) { + val = npu2_read(p, NPU2_XTS_CFG2); + npu2_write(p, NPU2_XTS_CFG2, val | NPU2_XTS_CFG2_NO_FLUSH_ENA); + } + + npu2_mcd_init(p); +} + static int64_t npu2_map_pe_dma_window_real(struct phb *phb, uint64_t pe_num, uint16_t window_id,