From patchwork Sat Jul 11 23:46:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Schwierzeck X-Patchwork-Id: 1327443 X-Patchwork-Delegate: daniel.schwierzeck@googlemail.com 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.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: 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=UymcMLla; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (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 4B465H3SwKz9sRN for ; Sun, 12 Jul 2020 09:46:59 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 49887821D9; Sun, 12 Jul 2020 01:46:36 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.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=gmail.com header.i=@gmail.com header.b="UymcMLla"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 787BE821B3; Sun, 12 Jul 2020 01:46:30 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-ej1-x643.google.com (mail-ej1-x643.google.com [IPv6:2a00:1450:4864:20::643]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 9037681F11 for ; Sun, 12 Jul 2020 01:46:26 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=daniel.schwierzeck@gmail.com Received: by mail-ej1-x643.google.com with SMTP id a1so10226944ejg.12 for ; Sat, 11 Jul 2020 16:46:26 -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=gFSWItIzcymI6p9jhXjfe1DTZQpA7bhJY2R+SsFZfxs=; b=UymcMLlaJcuZmhZZFT2dbg3b9cGX57VoZXfFoLuEHOYJsxgeuG2WRonOIiT2uYudDE yNK6OrwlW/R5VPNw41RI8bhWgw3lMbngfa961XnFTOTg0hv0Mi8MJWhn1e5CbWv6v0/R hW+oKYNe9b5PtJxuRN0ZuGUa/95siCeHC3jPE2ezMsM7y3vqsDbb5UIDPZ17n91oaknp 3H274afLp7sVDHvLplPVVPicXmrsdOd/xC2PcwBlvFNBJS4jH97bfyxyUGyZXIAd+g8w 9fW9kMuKuDySw7eVzEbyudOaln2ZCjAKapulaWAGY7HcqMg1cutLlF48ZoGrLl6OEz5w /tog== 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=gFSWItIzcymI6p9jhXjfe1DTZQpA7bhJY2R+SsFZfxs=; b=isGDeT/hN5gIUfVv3gF1vF2J12P2aS514m8+TNKfq6wjkk3YoucegQBOluVxFxy813 XBZ0lzA0LX7cHmSmw2omNku5q8vmuth4TesdLkcCvwvlTYtS2g0dy3Fq6e0XyvbNvP5U oGW6r2quJnpvKJSiljY5LY/a2MhFvjGiAfce5BrFPnj9un5O+i6ZElCXzDuNieob7FF7 WBcTJUm+GqxLhE1C/PjvMXBfBjuKe29siymeBbbWe40dE+mI8AG6fmdWOQbJHXSA1EvM z9YK5S8vl6QQE5Cl493RGsVzejTBmmGBPxn1yYUBnOhAm18tdVemtfMsGuDQ1zLwGKlD Y7tA== X-Gm-Message-State: AOAM532M8l3hEwHrCOFeRCaVCc7VPDGGmrC6NOc2lwOx6vYMSGi8YF2l ILO90z2AGorwRzUC2+rvJTkkObLK X-Google-Smtp-Source: ABdhPJy2BnTDcmdi0y//1tul7veCqVXSqEKe74YXo7SRCrt/Lfjr11ITCXcc4H0YzeenHzSSyu2/vQ== X-Received: by 2002:a17:906:7fc8:: with SMTP id r8mr69990744ejs.412.1594511185973; Sat, 11 Jul 2020 16:46:25 -0700 (PDT) Received: from workstation.lan.schwierd.dedyn.io ([2001:16b8:559e:4701:4026:74cf:a34a:dfa1]) by smtp.gmail.com with ESMTPSA id s24sm6363403ejv.110.2020.07.11.16.46.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Jul 2020 16:46:25 -0700 (PDT) From: Daniel Schwierzeck To: u-boot@lists.denx.de Cc: Aaron Williams , Stefan Roese , Daniel Schwierzeck Subject: [PATCH 3/4] mips: sync asm/addrspace.h with Linux 5.7 Date: Sun, 12 Jul 2020 01:46:17 +0200 Message-Id: <20200711234618.943362-4-daniel.schwierzeck@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200711234618.943362-1-daniel.schwierzeck@gmail.com> References: <20200711234618.943362-1-daniel.schwierzeck@gmail.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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.102.3 at phobos.denx.de X-Virus-Status: Clean Sync asm/addrspace.h with Linux 5.7 Signed-off-by: Daniel Schwierzeck Reviewed-by: Stefan Roese Tested-by: Stefan Roese --- arch/mips/include/asm/addrspace.h | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/arch/mips/include/asm/addrspace.h b/arch/mips/include/asm/addrspace.h index ae6f586f00..8112ab833e 100644 --- a/arch/mips/include/asm/addrspace.h +++ b/arch/mips/include/asm/addrspace.h @@ -42,7 +42,7 @@ /* * Returns the kernel segment base of a given address */ -#define KSEGX(a) ((_ACAST32_ (a)) & 0xe0000000) +#define KSEGX(a) ((_ACAST32_(a)) & _ACAST32_(0xe0000000)) /* * Returns the physical address of a CKSEGx / XKPHYS address @@ -123,8 +123,7 @@ #define PHYS_TO_XKSEG_UNCACHED(p) PHYS_TO_XKPHYS(K_CALG_UNCACHED, (p)) #define PHYS_TO_XKSEG_CACHED(p) PHYS_TO_XKPHYS(K_CALG_COH_SHAREABLE, (p)) #define XKPHYS_TO_PHYS(p) ((p) & TO_PHYS_MASK) -#define PHYS_TO_XKPHYS(cm, a) (_CONST64_(0x8000000000000000) | \ - (_CONST64_(cm) << 59) | (a)) +#define PHYS_TO_XKPHYS(cm, a) (XKPHYS | (_ACAST64_(cm) << 59) | (a)) /* * The ultimate limited of the 64-bit MIPS architecture: 2 bits for selecting @@ -133,18 +132,9 @@ */ #define TO_PHYS_MASK _CONST64_(0x07ffffffffffffff) /* 2^^59 - 1 */ -#ifndef CONFIG_CPU_R8000 - -/* - * The R8000 doesn't have the 32-bit compat spaces so we don't define them - * in order to catch bugs in the source code. - */ - #define COMPAT_K1BASE32 _CONST64_(0xffffffffa0000000) #define PHYS_TO_COMPATK1(x) ((x) | COMPAT_K1BASE32) /* 32-bit compat k1 */ -#endif - #define KDM_TO_PHYS(x) (_ACAST64_ (x) & TO_PHYS_MASK) #define PHYS_TO_K0(x) (_ACAST64_ (x) | CAC_BASE)