From patchwork Mon Aug 2 05:41:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jordan Niethe X-Patchwork-Id: 1512286 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ozlabs.org (client-ip=112.213.38.117; helo=lists.ozlabs.org; envelope-from=pdbg-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=SArTyCrV; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4GdTLl3yZYz9t0p for ; Mon, 2 Aug 2021 16:56:31 +1000 (AEST) Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4GdTLl31cdz30C4 for ; Mon, 2 Aug 2021 16:56:31 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=SArTyCrV; dkim-atps=neutral X-Original-To: pdbg@lists.ozlabs.org Delivered-To: pdbg@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gmail.com (client-ip=2607:f8b0:4864:20::1033; helo=mail-pj1-x1033.google.com; envelope-from=jniethe5@gmail.com; receiver=) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=SArTyCrV; dkim-atps=neutral Received: from mail-pj1-x1033.google.com (mail-pj1-x1033.google.com [IPv6:2607:f8b0:4864:20::1033]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4GdRhF56N2z301k for ; Mon, 2 Aug 2021 15:41:33 +1000 (AEST) Received: by mail-pj1-x1033.google.com with SMTP id j18-20020a17090aeb12b029017737e6c349so14689556pjz.0 for ; Sun, 01 Aug 2021 22:41:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=dRgBNovylclqoF2SbkUyjYNU3UmJcuxKuv2SFiUX7+s=; b=SArTyCrV6sQDcNQvFOe0XqxL0JcPisJbDZaq1oge6paeHQqavDqJgMoH67Rl8H9WzH jWBVQBwkmUSl/si16UmzfilpgMeS3g3+suPGlhpA445gPqDELugkiZhq6XQQ8HnGLhqs aLW1p7pUG/aW4fXMAW8XGWr5bxoETSyXs6+AbDSdl3kOPdy2f22m8o4NoYuH/9ECHJTz mSEiwKx/RezkWwl30wCCW/+1h+EUQU2uknpsKAlNnWDjNWcgUEh1I4cO45Na+dpBqHaw K6eHZUOe0upSh2/oreTL3S9N9yZAHxB++82BXybFcL7jlOPUnsAR/q+wu6nQi2Ey8LOq eaIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=dRgBNovylclqoF2SbkUyjYNU3UmJcuxKuv2SFiUX7+s=; b=f58UMnVOq6i0Sm/yY2dRz/OZ8u4r3DmMgPVceaJ28KfvKaVgZKFJl3JJ+mxK4ZHmTs rG2TJBV1u2/hm7Fp9XS2Mg/VFGqDUhBi/ttcZnqcrRPhX9vVW/iD/LP0smmbNo9yLZAt taaqCRU5kiIyomcYm3ie7KnsJp03Y+INFb7Y3VjItWgCZ/IpLkSq/gduhJiGuW0f0+jM MO2+gZ4DOKmNX49ciIqvPqJeQP4PrWdfOXr4sjhUxRwUTq6B8V3Uk4/sb7FElHpwRpFy 1y7iiDr9Lke4T3JBzeFMPumVEVJnEZy0foQqSud1PegNv1efBXjNntawTGOGp5RafSC9 xIbg== X-Gm-Message-State: AOAM531HFExnRU40DPz07Z11LPZ2QQKtJ2JwOI1Cez4YSydPiydZefWT C7reyIkwMHPkiNIfbaJJUKl9KlMsOb4= X-Google-Smtp-Source: ABdhPJx9fapMzFOtcOmFjqyLUf9JrShwaPwovN2qvNYe0RFR2/3RJ7GXZUpsUIFK0mGmIZrkFqDJKQ== X-Received: by 2002:a17:90b:3ec5:: with SMTP id rm5mr15203460pjb.132.1627882890855; Sun, 01 Aug 2021 22:41:30 -0700 (PDT) Received: from tee480.ozlabs.ibm.com (159-196-117-139.9fc475.syd.nbn.aussiebb.net. [159.196.117.139]) by smtp.gmail.com with ESMTPSA id 189sm1741852pfx.135.2021.08.01.22.41.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 01 Aug 2021 22:41:30 -0700 (PDT) From: Jordan Niethe To: pdbg@lists.ozlabs.org Date: Mon, 2 Aug 2021 15:41:02 +1000 Message-Id: <20210802054112.461728-3-jniethe5@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210802054112.461728-1-jniethe5@gmail.com> References: <20210802054112.461728-1-jniethe5@gmail.com> MIME-Version: 1.0 X-Mailman-Approved-At: Mon, 02 Aug 2021 16:56:28 +1000 Subject: [Pdbg] [PATCH 02/12] libpdbg: Add nhtm hardware unit for p10 X-BeenThere: pdbg@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "mailing list for https://github.com/open-power/pdbg development" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jordan Niethe Errors-To: pdbg-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Pdbg" p10 also has a Nest HTM. The biggest change is that on p10 there are two nhtm units. Add support for it. Signed-off-by: Jordan Niethe --- libpdbg/htm.c | 238 ++++++++++++++++++++++++++++++++++++++++++++++---- p10.dts.m4 | 12 +-- 2 files changed, 226 insertions(+), 24 deletions(-) diff --git a/libpdbg/htm.c b/libpdbg/htm.c index 43cef84522ef..ded46d2987a1 100644 --- a/libpdbg/htm.c +++ b/libpdbg/htm.c @@ -35,6 +35,7 @@ rc;}) #define MIN(x,y) ((x < y) ? x : y) +#define MAX(a, b) ((a) > (b) ? (a) : (b)) #define DEBUGFS_POWERPC "/sys/kernel/debug/powerpc" #define DEBUGFS_SCOM DEBUGFS_POWERPC"/scom" @@ -75,10 +76,34 @@ #define HTM_MEM_SCOPE PPC_BITMASK(1,3) /* Note: the next 3 change on P9 */ #define HTM_MEM_PRIORITY PPC_BITMASK(4,5) +#define HTM_MEM_PRIORITY_P10 PPC_BITMASK(4) #define HTM_MEM_SIZE_SMALL PPC_BIT(13) +#define HTM_MEM_SIZE_SMALL_P10 PPC_BIT(5) #define HTM_MEM_BASE PPC_BITMASK(14,39) +#define HTM_MEM_BASE_P10 PPC_BITMASK(8,39) #define HTM_MEM_SIZE PPC_BITMASK(40,48) #define HTM_STATUS 2 +#define HTM1_STATUS_MASK PPC_BITMASK(22,39) +#define HTM1_STATUS_CRESP_OV PPC_BIT(22) +#define HTM1_STATUS_REPAIR PPC_BIT(23) +#define HTM1_STATUS_BUF_WAIT PPC_BIT(24) +#define HTM1_STATUS_TRIG_DROPPED PPC_BIT(25) +#define HTM1_STATUS_ADDR_ERROR PPC_BIT(26) +#define HTM1_STATUS_REC_DROPPED PPC_BIT(27) +#define HTM1_STATUS_INIT PPC_BIT(28) +#define HTM1_STATUS_PREREQ PPC_BIT(29) +#define HTM1_STATUS_READY PPC_BIT(30) +#define HTM1_STATUS_TRACING PPC_BIT(31) +#define HTM1_STATUS_PAUSED PPC_BIT(32) +#define HTM1_STATUS_FLUSH PPC_BIT(33) +#define HTM1_STATUS_COMPLETE PPC_BIT(34) +#define HTM1_STATUS_ENABLE PPC_BIT(35) +#define HTM1_STATUS_STAMP PPC_BIT(36) +#define HTM1_STATUS_SCOM_ERROR PPC_BIT(37) +#define HTM1_STATUS_PARITY_ERROR PPC_BIT(38) +#define HTM1_STATUS_INVALID_CRESP PPC_BIT(39) +#define HTM1_STATUS_STATE_MASK (PPC_BITMASK(28,36) | HTM_STATUS_REPAIR) +#define HTM1_STATUS_ERROR_MASK (HTM_STATUS_CRESP_OV | PPC_BITMASK(24,27) | PPC_BITMASK(37,39)) #define HTM_STATUS_MASK PPC_BITMASK(2,19) #define HTM_STATUS_CRESP_OV PPC_BIT(2) #define HTM_STATUS_REPAIR PPC_BIT(3) @@ -102,6 +127,8 @@ #define HTM_STATUS_ERROR_MASK (HTM_STATUS_CRESP_OV | PPC_BITMASK(4,7) | PPC_BITMASK(17,19)) #define HTM_LAST_ADDRESS 3 #define HTM_LAST_ADDRESS_MASK PPC_BITMASK(8,56) +#define HTM1_LAST_ADDRESS 4 +#define HTM1_LAST_ADDRESS_MASK PPC_BITMASK(8,56) #define HTM_SCOM_TRIGGER 4 #define HTM_TRIG_START PPC_BIT(0) #define HTM_TRIG_STOP PPC_BIT(1) @@ -132,6 +159,24 @@ #define NHTM_FLEX_MUX 9 #define NHTM_FLEX_MUX_MASK PPC_BITMASK(0,35) #define NHTM_FLEX_DEFAULT 0xCB3456129 +#define NHTM_FLEX_MUX_MASK_P10 PPC_BITMASK(0,39) +#define NHTM_FLEX_DEFAULT_P10 0xCB34561567 +#define NHTM_ADDR_PAT 0xb +#define NHTM_ADDR_PAT_MASK PPC_BITMASK(0, 55) +#define NHTM_ADDR_MASK 0xc +#define NHTM_ADDR_MASK_MASK PPC_BITMASK(0, 55) +#define NHTM_STOP_FILTER 0xd +#define NHTM_STOP_FILTER_TTAG_PAT PPC_BITMASK(0, 14) +#define NHTM_STOP_FILTER_TTAG_MASK PPC_BITMASK(15, 29) +#define NHTM_STOP_FILTER_TTYPE_PAT PPC_BITMASK(30, 36) +#define NHTM_STOP_FILTER_TTYPE_MASK PPC_BITMASK(37, 43) +#define NHTM_STOP_FILTER_CRESP_PAT PPC_BITMASK(44, 48) +#define NHTM_STOP_FILTER_CRESP_MASK PPC_BITMASK(49, 53) +#define NHTM_STOP_CYCLES PPC_BITMASK(54, 60) +#define NHTM_STOP_FILT_ADDR_PAT 0xe +#define NHTM_STOP_FILT_ADDR_PAT_MASK PPC_BITMASK(0, 55) +#define NHTM_STOP_FILT_ADDR_MASK 0xf +#define NHTM_STOP_FILT_ADDR_MASK_MASK PPC_BITMASK(0, 55) enum htm_state { INIT, @@ -161,14 +206,25 @@ enum htm_error { struct htm_status { enum htm_state state; + enum htm_state state1; enum htm_error error; + enum htm_error error1; bool mem_size_select; uint16_t mem_size; uint64_t mem_base; uint64_t mem_last; + uint64_t mem_last1; uint64_t raw; }; +/* Some of the nhtm registers on P10 have moved address slightly */ +static unsigned long reg_off(struct htm *htm, unsigned long reg) +{ + if (pdbg_target_compatible(&htm->target, "ibm,power10-nhtm")) + return reg + 1; + return reg; +} + static struct htm *check_and_convert(struct pdbg_target *target) { if (!pdbg_target_is_class(target, "nhtm") && @@ -292,6 +348,37 @@ static int get_status(struct htm *htm, struct htm_status *status) status->error = NONE; } + if (pdbg_target_compatible(&htm->target, "ibm,power10-nhtm")) { + switch (status->raw & HTM1_STATUS_ERROR_MASK) { + case HTM1_STATUS_CRESP_OV: + status->error1 = CRESP_OV; + break; + case HTM1_STATUS_BUF_WAIT: + status->error1 = BUF_WAIT; + break; + case HTM1_STATUS_TRIG_DROPPED: + status->error1 = TRIGGER_DROPPED; + break; + case HTM1_STATUS_ADDR_ERROR: + status->error1 = ADDR_ERROR; + break; + case HTM1_STATUS_REC_DROPPED: + status->error1 = RECORD_DROPPED; + break; + case HTM1_STATUS_SCOM_ERROR: + status->error1 = SCOM_ERROR; + break; + case HTM1_STATUS_PARITY_ERROR: + status->error1 = PARITY_ERROR; + break; + case HTM1_STATUS_INVALID_CRESP: + status->error1 = INVALID_CRESP; + break; + default: + status->error1 = NONE; + } + } + switch (status->raw & HTM_STATUS_STATE_MASK) { case HTM_STATUS_REPAIR: status->state = REPAIR; @@ -327,16 +414,63 @@ static int get_status(struct htm *htm, struct htm_status *status) status->state = UNINITIALIZED; } + if (pdbg_target_compatible(&htm->target, "ibm,power10-nhtm")) { + switch (status->raw & HTM1_STATUS_STATE_MASK) { + case HTM1_STATUS_REPAIR: + status->state1 = REPAIR; + break; + case HTM1_STATUS_INIT: + status->state1 = INIT; + break; + case HTM1_STATUS_PREREQ: + status->state1 = PREREQ; + break; + case HTM1_STATUS_READY: + status->state1 = READY; + break; + case HTM1_STATUS_TRACING: + status->state1 = TRACING; + break; + case HTM1_STATUS_PAUSED: + status->state1 = PAUSED; + break; + case HTM1_STATUS_FLUSH: + status->state1 = FLUSH; + break; + case HTM1_STATUS_COMPLETE: + status->state1 = COMPLETE; + break; + case HTM1_STATUS_ENABLE: + status->state1 = ENABLE; + break; + case HTM1_STATUS_STAMP: + status->state1 = STAMP; + break; + default: + status->state1 = UNINITIALIZED; + } + } + if (HTM_ERR(pib_read(&htm->target, HTM_MEMORY_CONF, &val))) return -1; - status->mem_size_select = val & HTM_MEM_SIZE_SMALL; + if (pdbg_target_compatible(&htm->target, "ibm,power10-nhtm")) { + status->mem_size_select = val & HTM_MEM_SIZE_SMALL_P10; + status->mem_base = val & HTM_MEM_BASE_P10; + } else { + status->mem_size_select = val & HTM_MEM_SIZE_SMALL; + status->mem_base = val & HTM_MEM_BASE; + } status->mem_size = GETFIELD(HTM_MEM_SIZE,val); - status->mem_base = val & HTM_MEM_BASE; if (HTM_ERR(pib_read(&htm->target, HTM_LAST_ADDRESS, &status->mem_last))) return -1; + if (pdbg_target_compatible(&htm->target, "ibm,power10-nhtm")) { + if (HTM_ERR(pib_read(&htm->target, HTM1_LAST_ADDRESS, &status->mem_last1))) + return -1; + } + return 0; } @@ -540,18 +674,19 @@ static int configure_nhtm(struct htm *htm, bool wrap) return -1; /* Stop on core xstop */ - if (HTM_ERR(pib_write(&htm->target, HTM_TRIGGER_CONTROL, HTM_CTRL_XSTOP_STOP))) + if (HTM_ERR(pib_write(&htm->target, reg_off(htm, HTM_TRIGGER_CONTROL), + HTM_CTRL_XSTOP_STOP))) return -1;; /* * These values are taken from a cronus booted system. */ - if (HTM_ERR(pib_write(&htm->target, NHTM_FILTER_CONTROL, + if (HTM_ERR(pib_write(&htm->target, reg_off(htm, NHTM_FILTER_CONTROL), NHTM_FILTER_MASK | /* no pattern matching */ NHTM_FILTER_CRESP_MASK))) /* no pattern matching */ return -1; - if (HTM_ERR(pib_write(&htm->target, NHTM_TTYPE_FILTER_CONTROL, + if (HTM_ERR(pib_write(&htm->target, reg_off(htm, NHTM_TTYPE_FILTER_CONTROL), NHTM_TTYPE_TYPE_MASK | /* no pattern matching */ NHTM_TTYPE_SIZE_MASK ))) /* no pattern matching */ return -1; @@ -566,6 +701,35 @@ static int configure_nhtm(struct htm *htm, bool wrap) } } + if (pdbg_target_compatible(&htm->target, "ibm,power10-nhtm")) { + if (HTM_ERR(pib_read(&htm->target, reg_off(htm, NHTM_FLEX_MUX), &val))) + return -1; + + if (GETFIELD(NHTM_FLEX_MUX_MASK_P10, val) != NHTM_FLEX_DEFAULT_P10) { + PR_ERROR("The HTM Flex wasn't default value\n"); + return -1; + } + + if (HTM_ERR(pib_write(&htm->target, NHTM_ADDR_PAT, 0))) + return -1; + + if (HTM_ERR(pib_write(&htm->target, NHTM_ADDR_MASK, NHTM_ADDR_MASK_MASK))) + return -1; + + if (HTM_ERR(pib_write(&htm->target, NHTM_STOP_FILTER, + NHTM_STOP_FILTER_TTAG_MASK | + NHTM_STOP_FILTER_TTYPE_MASK | + NHTM_STOP_FILTER_CRESP_MASK))) + return -1; + + if (HTM_ERR(pib_write(&htm->target, NHTM_STOP_FILT_ADDR_PAT, 0))) + return -1; + + if (HTM_ERR(pib_write(&htm->target, NHTM_STOP_FILT_ADDR_MASK, + NHTM_STOP_FILT_ADDR_MASK_MASK))) + return -1; + } + return 0; } @@ -577,9 +741,13 @@ static int deconfigure_nhtm(struct htm *htm) return 0; } -static int is_startable(struct htm_status *status) +static int is_startable(struct htm *htm, struct htm_status *status) { - return (status->state == READY || status->state == PAUSED); + if (pdbg_target_compatible(&htm->target, "ibm,power10-nhtm")) + return ((status->state == READY || status->state == PAUSED) && + (status->state1 == READY || status->state1 == PAUSED)); + else + return (status->state == READY || status->state == PAUSED); } static char *get_debugfs_file(struct htm *htm, const char *file) @@ -715,7 +883,10 @@ static int configure_memory(struct htm *htm) small = 0; if (size < 512*1024*1024) small = 1; - val = SETFIELD(HTM_MEM_SIZE_SMALL, val, small); + if (pdbg_target_compatible(&htm->target, "ibm,power10-nhtm")) + val = SETFIELD(HTM_MEM_SIZE_SMALL_P10, val, small); + else + val = SETFIELD(HTM_MEM_SIZE_SMALL, val, small); shift = 29; /* large */ if (small) shift = 24; @@ -728,13 +899,16 @@ static int configure_memory(struct htm *htm) * already shifted correct as read from the kernel, or'ing it * in works fine. */ - val = SETFIELD(HTM_MEM_BASE, val, 0); + if (pdbg_target_compatible(&htm->target, "ibm,power10-nhtm")) + val = SETFIELD(HTM_MEM_BASE_P10, val, 0); + else + val = SETFIELD(HTM_MEM_BASE, val, 0); val |= base; if (HTM_ERR(pib_write(&htm->target, HTM_MEMORY_CONF, val))) return -1; - if (HTM_ERR(pib_write(&htm->target, HTM_SCOM_TRIGGER, HTM_TRIG_RESET))) + if (HTM_ERR(pib_write(&htm->target, reg_off(htm, HTM_SCOM_TRIGGER), HTM_TRIG_RESET))) return -1; return 0; @@ -800,16 +974,16 @@ static int __do_htm_start(struct htm *htm, bool wrap) if (HTM_ERR(get_status(htm, &status))) return -1; - if (!is_startable(&status)) { + if (!is_startable(htm, &status)) { PR_ERROR("HTM not in a startable state!\n"); return -1; } PR_INFO("* Sending START trigger to HTM\n"); - if (HTM_ERR(pib_write(&htm->target, HTM_SCOM_TRIGGER, HTM_TRIG_MARK_VALID))) + if (HTM_ERR(pib_write(&htm->target, reg_off(htm, HTM_SCOM_TRIGGER), HTM_TRIG_MARK_VALID))) return -1; - if (HTM_ERR(pib_write(&htm->target, HTM_SCOM_TRIGGER, HTM_TRIG_START))) + if (HTM_ERR(pib_write(&htm->target, reg_off(htm, HTM_SCOM_TRIGGER), HTM_TRIG_START))) return -1; if (htm_toggle_debug_bit(htm)) @@ -843,7 +1017,7 @@ static int do_htm_stop(struct htm *htm) } if (status.state == TRACING) { PR_INFO("* Sending STOP trigger to HTM\n"); - if (HTM_ERR(pib_write(&htm->target, HTM_SCOM_TRIGGER, HTM_TRIG_STOP))) + if (HTM_ERR(pib_write(&htm->target, reg_off(htm, HTM_SCOM_TRIGGER), HTM_TRIG_STOP))) return -1; } else { PR_INFO("* Skipping STOP trigger, HTM is not running\n"); @@ -1008,9 +1182,9 @@ static int do_htm_dump(struct htm *htm, char *filename) { char *trace_file; struct htm_status status; - uint64_t last, end, trace_size; + uint64_t last, end, trace_size, last1 = 0; int trace_fd, dump_fd; - uint32_t eyecatcher; + uint64_t eyecatcher; size_t r; bool wrapped; @@ -1025,6 +1199,11 @@ static int do_htm_dump(struct htm *htm, char *filename) return -1; } + if (pdbg_target_compatible(&htm->target, "ibm,power10-nhtm") && status.state1 != COMPLETE) { + PR_INFO("* Skipping DUMP tigger, HTM1 is not in complete state\n"); + return -1; + } + trace_file = get_debugfs_file(htm, "trace"); if (!trace_file) return -1; @@ -1036,7 +1215,12 @@ static int do_htm_dump(struct htm *htm, char *filename) goto out3; } - r = read(trace_fd, &eyecatcher, 4); + if (pdbg_target_compatible(&htm->target, "ibm,power10-nhtm")) { + lseek(trace_fd, 8, SEEK_SET); + r = read(trace_fd, &eyecatcher, 8); + } else { + r = read(trace_fd, &eyecatcher, 4); + } if (r == -1) { PR_ERROR("Failed to read from %s: %m\n", trace_file); goto out2; @@ -1045,6 +1229,8 @@ static int do_htm_dump(struct htm *htm, char *filename) if (eyecatcher == 0x00f0efac) wrapped = false; last = status.mem_last - status.mem_base; + if (pdbg_target_compatible(&htm->target, "ibm,power10-nhtm")) + last1 = status.mem_last1 - status.mem_base; end = htm_trace_size(&status); trace_size = wrapped ? end : last; @@ -1083,7 +1269,7 @@ static int do_htm_dump(struct htm *htm, char *filename) r = lseek(trace_fd, 0, SEEK_SET); if (r == -1) goto out1; - r = copy_file(dump_fd, trace_fd, last); + r = copy_file(dump_fd, trace_fd, MAX(last1, last)); if (r) goto out1; r = 1; @@ -1193,10 +1379,26 @@ static struct htm p8_chtm = { }; DECLARE_HW_UNIT(p8_chtm); +static struct htm p10_nhtm = { + .target = { + .name = "POWER10 Nest HTM", + .compatible = "ibm,power10-nhtm", + .class = "nhtm", + .probe = nhtm_probe, + }, + .start = do_htm_start, + .stop = do_htm_stop, + .record = do_htm_record, + .status = do_htm_status, + .dump = do_htm_dump, +}; +DECLARE_HW_UNIT(p10_nhtm); + __attribute__((constructor)) static void register_htm(void) { pdbg_hwunit_register(PDBG_DEFAULT_BACKEND, &p8_nhtm_hw_unit); pdbg_hwunit_register(PDBG_DEFAULT_BACKEND, &p9_nhtm_hw_unit); + pdbg_hwunit_register(PDBG_DEFAULT_BACKEND, &p10_nhtm_hw_unit); pdbg_hwunit_register(PDBG_DEFAULT_BACKEND, &p8_chtm_hw_unit); } diff --git a/p10.dts.m4 b/p10.dts.m4 index 52e62f017106..d58086962bfb 100644 --- a/p10.dts.m4 +++ b/p10.dts.m4 @@ -316,21 +316,21 @@ define(`CHIP', #size-cells = < 0x01 >; index = < 0x$1 >; - adu@90000 { + adu@3001C00 { compatible = "ibm,power10-adu"; - reg = < 0x00 0x90000 0x50 >; + reg = < 0x00 0x3001C00 0x50 >; system-path = "/mem$1"; }; - htm@5012880 { + htm@3011C80 { compatible = "ibm,power10-nhtm"; - reg = < 0x00 0x5012880 0x40 >; + reg = < 0x00 0x3011C80 0x40 >; index = < 0x$1 >; }; - htm@50128C0 { + htm@30120C0 { compatible = "ibm,power10-nhtm"; - reg = < 0x00 0x50128c0 0x40 >; + reg = < 0x00 0x30120C0 0x40 >; index = < 0x$1 >; };