From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pl1-x635.google.com (mail-pl1-x635.google.com [IPv6:2607:f8b0:4864:20::635]) by sourceware.org (Postfix) with ESMTPS id 4ED853857C6D for ; Thu, 1 Jul 2021 23:17:54 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 4ED853857C6D Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-pl1-x635.google.com with SMTP id h6so3471178plf.11 for ; Thu, 01 Jul 2021 16:17:54 -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:mime-version :content-transfer-encoding; bh=KPoXi+XXRRxDBgzWPSUep7fmZRtnonAVtw36zi2JpNQ=; b=m4hFMFAPnj0ju5wXr5GSEPvAqN1glyWJyztW4G7AH/7XLZfpPqRfkQYbzs3DvdGfdX nlG659jnEi9V/3gkGz/sLEAb+YoveEEfMq9ngLxMqgyFrGn4ucppKN8qJxj6Rf8RRrmA dsXfR3UtfwZhX6rdmBTLcQTrZTcvfMGifBFG7LETMMA1AEXY1iQ+lawoZQEQfmebSlCC eEjwutFh8/ipMGX10cIkuVBgRhiJtJDYPBV08U0OyiZMGphqeDumGZwClIqV1EQWLgEf krYEPcIeZOCIqlwbQl4fGpksui0AaoanotcQ8hoLap4JW8FwsrOO3hTbSEWrMRhDkPyM jcTA== 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:mime-version :content-transfer-encoding; bh=KPoXi+XXRRxDBgzWPSUep7fmZRtnonAVtw36zi2JpNQ=; b=iZ1rD9vxgOdIPDi3mr2tLfW4N9fp661YJTnNH6bo+eeL/Ypr3NXrl8FlNZ6WqCI6Nw tlQL3ks0GhGJB84NbELXvoqrLSCYLpAD5SguIYalr/PCBoGuq8fI/GQ9t+yi51c1OEyN pL2lpqC+GYQgUyVGzPdCR/LmEbKcggTTHFgrD41zhs1bRXJ8lsSR6l16pi32b5ZMxtIy +6Wuf78YZUUuZFDNaFaRWKrQNuh5RG8F3JnJ3YHsf2BFlTcNRlwMOJSSCznWSePdgMpo SS1izkOhLGYINoWoWsVBfz4rvXuCHt9lb/YTn277/67vLpdTeAhjpsJtM5Grg3YSapMq Wzmw== X-Gm-Message-State: AOAM532Is6gDC1ZF4xjEey8dNS/1f4Z6iY2DsI5uG4TRbEOA5cCBCQmN b3FJkzEzs63OVJBjbsEYKNIrdo8D6NU= X-Google-Smtp-Source: ABdhPJxp9/bh+LbfBaosh8XpPeTG0n1KcwvH2uWJRHT0F3RIk93wHEpI5GuUFkzdnJ3/+rgxDQaAqg== X-Received: by 2002:a17:902:e5ce:b029:129:3d74:d873 with SMTP id u14-20020a170902e5ceb02901293d74d873mr1747325plf.19.1625181473083; Thu, 01 Jul 2021 16:17:53 -0700 (PDT) Received: from localhost (g164.115-65-218.ppp.wakwak.ne.jp. [115.65.218.164]) by smtp.gmail.com with ESMTPSA id 136sm1157495pfa.158.2021.07.01.16.17.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Jul 2021 16:17:52 -0700 (PDT) From: Stafford Horne To: Newlib Cc: Openrisc , Stafford Horne Subject: [PATCH] libgloss/or1k: Correct the IMMU SXE and UXE flags Date: Fri, 2 Jul 2021 08:17:48 +0900 Message-Id: <20210701231748.1098623-1-shorne@gmail.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: newlib@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Newlib mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Jul 2021 23:17:56 -0000 These have been defined incorrectly, as per specification and CPU implementations SXE is bit 6 and UXE is bit 7. This was noticed when tracking down our test suite mmu test failures. Test Suite: https://github.com/openrisc/or1k-tests/blob/master/native/or1k/or1k-mmu.c#L68-L72 Spec: https://raw.githubusercontent.com/openrisc/doc/master/openrisc-arch-1.3-rev1.pdf See section 8.4.8 Instruction Translation Lookaside Buffer Way y Translate Registers where these are defined. Signed-off-by: Stafford Horne --- libgloss/or1k/include/or1k-sprs.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/libgloss/or1k/include/or1k-sprs.h b/libgloss/or1k/include/or1k-sprs.h index 8d1fe5ed9..d545fb1d3 100644 --- a/libgloss/or1k/include/or1k-sprs.h +++ b/libgloss/or1k/include/or1k-sprs.h @@ -1797,17 +1797,17 @@ #define OR1K_SPR_IMMU_ITLBW_TR_D_GET(X) (((X) >> 5) & 0x1) #define OR1K_SPR_IMMU_ITLBW_TR_D_SET(X, Y) (((X) & OR1K_UNSIGNED(0xffffffdf)) | ((!!(Y)) << 5)) -/* User Execute Enable */ -#define OR1K_SPR_IMMU_ITLBW_TR_UXE_OFFSET 6 -#define OR1K_SPR_IMMU_ITLBW_TR_UXE_MASK 0x00000040 -#define OR1K_SPR_IMMU_ITLBW_TR_UXE_GET(X) (((X) >> 6) & 0x1) -#define OR1K_SPR_IMMU_ITLBW_TR_UXE_SET(X, Y) (((X) & OR1K_UNSIGNED(0xffffffbf)) | ((!!(Y)) << 6)) - /* Supervisor Execute Enable */ -#define OR1K_SPR_IMMU_ITLBW_TR_SXE_OFFSET 7 -#define OR1K_SPR_IMMU_ITLBW_TR_SXE_MASK 0x00000080 -#define OR1K_SPR_IMMU_ITLBW_TR_SXE_GET(X) (((X) >> 7) & 0x1) -#define OR1K_SPR_IMMU_ITLBW_TR_SXE_SET(X, Y) (((X) & OR1K_UNSIGNED(0xffffff7f)) | ((!!(Y)) << 7)) +#define OR1K_SPR_IMMU_ITLBW_TR_SXE_OFFSET 6 +#define OR1K_SPR_IMMU_ITLBW_TR_SXE_MASK 0x00000040 +#define OR1K_SPR_IMMU_ITLBW_TR_SXE_GET(X) (((X) >> 6) & 0x1) +#define OR1K_SPR_IMMU_ITLBW_TR_SXE_SET(X, Y) (((X) & OR1K_UNSIGNED(0xffffffbf)) | ((!!(Y)) << 6)) + +/* User Execute Enable */ +#define OR1K_SPR_IMMU_ITLBW_TR_UXE_OFFSET 7 +#define OR1K_SPR_IMMU_ITLBW_TR_UXE_MASK 0x00000080 +#define OR1K_SPR_IMMU_ITLBW_TR_UXE_GET(X) (((X) >> 7) & 0x1) +#define OR1K_SPR_IMMU_ITLBW_TR_UXE_SET(X, Y) (((X) & OR1K_UNSIGNED(0xffffff7f)) | ((!!(Y)) << 7)) /* Physical Page Number */ #define OR1K_SPR_IMMU_ITLBW_TR_PPN_LSB 13 -- 2.31.1