From mboxrd@z Thu Jan 1 00:00:00 1970 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 11D60C7EE23 for ; Thu, 8 Jun 2023 08:00:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234155AbjFHIAH (ORCPT ); Thu, 8 Jun 2023 04:00:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49074 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233970AbjFHH7s (ORCPT ); Thu, 8 Jun 2023 03:59:48 -0400 Received: from mail-pf1-x42e.google.com (mail-pf1-x42e.google.com [IPv6:2607:f8b0:4864:20::42e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CC6622709 for ; Thu, 8 Jun 2023 00:59:24 -0700 (PDT) Received: by mail-pf1-x42e.google.com with SMTP id d2e1a72fcca58-662f0feafb2so251552b3a.1 for ; Thu, 08 Jun 2023 00:59:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686211163; x=1688803163; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=gIf7mMUq3IomvCRzE/BwBbmr5XmOTNpFkv4p84CsDuY=; b=jsPmE4fa/vT9fHYhtvIl+4+1qBxxy9x9h7KJous9XPUnlMoK2Yq84qaDVaYAgzdGsv wwzj9dh1JSY3RVDhi/CFgfB69g4HrwyEaHKcxW2Wj5JDpBmRfOT0mhRoEtc+XLq8vXE9 9F1JUrsDZXZ5oaAqZiF4NOvaROlEKlmclayf5q4alYReCrxdDy8uhu14teAPlnc0sH7z YiCaHdTlV2oWOU97+MdATNnkpUJ+qJM0Fe7wCzHoNghxfGfSqJfQ5ZHHET9gO3vQr8Ts AHhN5WQCMI2IgqpuqshQxUFf9CSgvmgEap3OI7UV6vERYP5duwMbmQSskAGbzNn3olBd hQ7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686211163; x=1688803163; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=gIf7mMUq3IomvCRzE/BwBbmr5XmOTNpFkv4p84CsDuY=; b=MbCRp34Ov0Q/B6VDAyxawWVu8iAEFRtN4WUiDL5fpmV1GfIl4ap7Ao3Bgi9wFea5X7 oBaoPmJjX4H/w3YILx2Oyan4dQXWHf3XDMqb0vuPrOFxTHpN4F2Fy2PDvIUA4zg1hUH3 XHM2+uusS2wmU9//KtY1fU4Q3+NZJH0e+/qOXPbQNr2r+f5d+X1QB4UUnHYKTZjwOnWm 02CxUO69RD1ZxfX0II7IRFNpPhMtgWmlreq5m5OHcPLgcHO5aF/E7SKiZZG1e8K8QbEM gaDKqzqlfHwSiqEbPE3IxJIUabytgIKtMnnEE3msE6K11i4PgeMwC8EZmSzL6L9+DRgG nIXw== X-Gm-Message-State: AC+VfDwn+00S38mG84zQLWUB/5/smriYe1/rJ4SGAF9jupOH6YKX6kVK q230JNjluG/NB7DPKBwRgrlJFyqOiHQ= X-Google-Smtp-Source: ACHHUZ7j9tL8nMT4K1M5MLI0aYyAcL3vvSvos/iW3DoAZcAQYrxGQJhr3f0xfPBxEk3BSMBsxI26nQ== X-Received: by 2002:a05:6a20:8405:b0:103:b585:b587 with SMTP id c5-20020a056a20840500b00103b585b587mr1786346pzd.13.1686211163017; Thu, 08 Jun 2023 00:59:23 -0700 (PDT) Received: from wheely.local0.net ([1.146.34.117]) by smtp.gmail.com with ESMTPSA id 17-20020a630011000000b00542d7720a6fsm673182pga.88.2023.06.08.00.59.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Jun 2023 00:59:22 -0700 (PDT) From: Nicholas Piggin To: kvm@vger.kernel.org Cc: Nicholas Piggin , linuxppc-dev@lists.ozlabs.org, Laurent Vivier , Thomas Huth Subject: [kvm-unit-tests v4 12/12] powerpc/sprs: Test hypervisor registers on powernv machine Date: Thu, 8 Jun 2023 17:58:26 +1000 Message-Id: <20230608075826.86217-13-npiggin@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230608075826.86217-1-npiggin@gmail.com> References: <20230608075826.86217-1-npiggin@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org This enables HV privilege registers to be tested with the powernv machine. Acked-by: Thomas Huth Signed-off-by: Nicholas Piggin --- powerpc/sprs.c | 33 +++++++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/powerpc/sprs.c b/powerpc/sprs.c index d5664201..07a4e759 100644 --- a/powerpc/sprs.c +++ b/powerpc/sprs.c @@ -199,16 +199,16 @@ static const struct spr sprs_power_common[1024] = { [190] = {"HFSCR", 64, HV_RW, }, [256] = {"VRSAVE", 32, RW, }, [259] = {"SPRG3", 64, RO, }, -[284] = {"TBL", 32, HV_WO, }, -[285] = {"TBU", 32, HV_WO, }, -[286] = {"TBU40", 64, HV_WO, }, +[284] = {"TBL", 32, HV_WO, }, /* Things can go a bit wonky with */ +[285] = {"TBU", 32, HV_WO, }, /* Timebase changing. Should save */ +[286] = {"TBU40", 64, HV_WO, }, /* and restore it. */ [304] = {"HSPRG0", 64, HV_RW, }, [305] = {"HSPRG1", 64, HV_RW, }, [306] = {"HDSISR", 32, HV_RW, SPR_INT, }, [307] = {"HDAR", 64, HV_RW, SPR_INT, }, [308] = {"SPURR", 64, HV_RW | OS_RO, SPR_ASYNC, }, [309] = {"PURR", 64, HV_RW | OS_RO, SPR_ASYNC, }, -[313] = {"HRMOR", 64, HV_RW, }, +[313] = {"HRMOR", 64, HV_RW, SPR_HARNESS, }, /* Harness can't cope with HRMOR changing */ [314] = {"HSRR0", 64, HV_RW, SPR_INT, }, [315] = {"HSRR1", 64, HV_RW, SPR_INT, }, [318] = {"LPCR", 64, HV_RW, }, @@ -306,7 +306,7 @@ static const struct spr sprs_power9_10[1024] = { [921] = {"TSCR", 32, HV_RW, }, [922] = {"TTR", 64, HV_RW, }, [1006]= {"TRACE", 64, WO, }, -[1008]= {"HID", 64, HV_RW, }, +[1008]= {"HID", 64, HV_RW, SPR_HARNESS, }, /* At least HILE would be unhelpful to change */ }; /* This covers POWER8 and POWER9 PMUs */ @@ -350,6 +350,22 @@ static const struct spr sprs_power10_pmu[1024] = { static struct spr sprs[1024]; +static bool spr_read_perms(int spr) +{ + if (machine_is_powernv()) + return !!(sprs[spr].access & SPR_HV_READ); + else + return !!(sprs[spr].access & SPR_OS_READ); +} + +static bool spr_write_perms(int spr) +{ + if (machine_is_powernv()) + return !!(sprs[spr].access & SPR_HV_WRITE); + else + return !!(sprs[spr].access & SPR_OS_WRITE); +} + static void setup_sprs(void) { uint32_t pvr = mfspr(287); /* Processor Version Register */ @@ -466,7 +482,7 @@ static void get_sprs(uint64_t *v) int i; for (i = 0; i < 1024; i++) { - if (!(sprs[i].access & SPR_OS_READ)) + if (!spr_read_perms(i)) continue; v[i] = __mfspr(i); } @@ -477,8 +493,9 @@ static void set_sprs(uint64_t val) int i; for (i = 0; i < 1024; i++) { - if (!(sprs[i].access & SPR_OS_WRITE)) + if (!spr_write_perms(i)) continue; + if (sprs[i].type & SPR_HARNESS) continue; if (!strcmp(sprs[i].name, "MMCR0")) { @@ -550,7 +567,7 @@ int main(int argc, char **argv) for (i = 0; i < 1024; i++) { bool pass = true; - if (!(sprs[i].access & SPR_OS_READ)) + if (!spr_read_perms(i)) continue; if (sprs[i].width == 32) { -- 2.40.1