From owner-dev-commits-src-all@freebsd.org Sun Jan 10 21:40:24 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6E5ED4DAF9D for ; Sun, 10 Jan 2021 21:40:24 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DDVcl50gTz3lGK for ; Sun, 10 Jan 2021 21:40:23 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: by mail-wr1-f54.google.com with SMTP id d13so14408303wrc.13 for ; Sun, 10 Jan 2021 13:40:23 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; bh=v/cMVJWH+dgSCOwwPk6krsGZQHtiRhslKsmTX8YNp1I=; b=dooM5rbBvuG6og3qrvsW35PNbzr8jKRAPxbM8FqDlfBYjjF0Xb7OIdEjGHqgOIOpNp aWXODZ51QARDOWR1R2f2wVKgAFPXMyMUfW2nWlgSNJMR132s57LmSyeZfgjv5Ln9RiRb d50pWssYxb9Yg8t/cUBplQSFyt87LUH6rUjed6SfIPG32zkghHqkgDh2H82U619+IZdo YxiKQAT4t7jqLY29FXxVwrO8GrXfMHdW5dp4T/mV098QYYFqw9lJpBvUJRhCnMUpAq1G 5VYBCBzB6MpyU2qBMrYymIF/iUyHI/eKA4rZF5/pNh6K5e92THILSi/vx6Gcn43XL6rr +Saw== X-Gm-Message-State: AOAM533S2VPwnGl3OLnG00yEUNLLzKPJjZQaKMd/GnPUkxJSFeN9dopN zAXwJ6Y61V3bDMaQcDBrmP592mCQWhq7Bonb X-Google-Smtp-Source: ABdhPJyHnXyVMJA0IMsHHMbZJKxDKNB9YWK2iOUbflJQtOtZHzrC/1hNP1tgGfTnpM5DeQeBtg78pA== X-Received: by 2002:a5d:51cc:: with SMTP id n12mr13224385wrv.375.1610314822228; Sun, 10 Jan 2021 13:40:22 -0800 (PST) Received: from [192.168.149.251] (trinity-students-nat.trin.cam.ac.uk. [131.111.193.104]) by smtp.gmail.com with ESMTPSA id o83sm19796249wme.21.2021.01.10.13.40.21 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 10 Jan 2021 13:40:21 -0800 (PST) Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 13.4 \(3608.120.23.2.4\)) Subject: Re: git: facdd1cd2045 - main - cgem: add 64-bit support From: Jessica Clarke In-Reply-To: <51C7F0DA-0EA2-45EF-A817-53984205C648@freebsd.org> Date: Sun, 10 Jan 2021 21:40:21 +0000 Cc: Mitchell Horne , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: 7bit Message-Id: <6FE70CCD-B854-4D41-B050-B7CBD516067F@freebsd.org> References: <202101102053.10AKrGqv070360@gitrepo.freebsd.org> <51C7F0DA-0EA2-45EF-A817-53984205C648@freebsd.org> To: Konstantin Belousov X-Mailer: Apple Mail (2.3608.120.23.2.4) X-Rspamd-Queue-Id: 4DDVcl50gTz3lGK X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of jrtc27@jrtc27.com designates 209.85.221.54 as permitted sender) smtp.mailfrom=jrtc27@jrtc27.com X-Spamd-Result: default: False [-2.42 / 15.00]; TO_DN_EQ_ADDR_SOME(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_DN_SOME(0.00)[]; MV_CASE(0.50)[]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17]; RCPT_COUNT_FIVE(0.00)[5]; RCVD_COUNT_THREE(0.00)[3]; NEURAL_HAM_SHORT(-0.92)[-0.918]; FREEMAIL_TO(0.00)[gmail.com]; FORGED_SENDER(0.30)[jrtc27@freebsd.org,jrtc27@jrtc27.com]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; MID_RHS_MATCH_FROM(0.00)[]; FROM_NEQ_ENVFROM(0.00)[jrtc27@freebsd.org,jrtc27@jrtc27.com]; ARC_NA(0.00)[]; RBL_DBL_DONT_QUERY_IPS(0.00)[209.85.221.54:from]; FREEFALL_USER(0.00)[jrtc27]; FROM_HAS_DN(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-all@freebsd.org]; DMARC_NA(0.00)[freebsd.org]; SPAMHAUS_ZRD(0.00)[209.85.221.54:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[209.85.221.54:from]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.221.54:from]; RCVD_TLS_ALL(0.00)[]; MAILMAN_DEST(0.00)[dev-commits-src-all] X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Jan 2021 21:40:24 -0000 On 10 Jan 2021, at 21:33, Jessica Clarke wrote: > On 10 Jan 2021, at 21:31, Konstantin Belousov wrote: >> On Sun, Jan 10, 2021 at 09:17:48PM +0000, Jessica Clarke wrote: >>> On 10 Jan 2021, at 20:53, Mitchell Horne wrote: >>>> diff --git a/sys/dev/cadence/if_cgem.c b/sys/dev/cadence/if_cgem.c >>>> index 3c5277452469..77337e977dcc 100644 >>>> --- a/sys/dev/cadence/if_cgem.c >>>> +++ b/sys/dev/cadence/if_cgem.c >>>> @@ -77,6 +77,14 @@ __FBSDID("$FreeBSD$"); >>>> #include >>>> #include >>>> >>>> +#ifdef EXT_RESOURCES >>>> +#include >>>> +#endif >>>> + >>>> +#if INTPTR_MAX == INT64_MAX >>>> +#define CGEM64 >>>> +#endif >>> >>> This isn't going to work with CHERI. Perhaps a BUS_SPACE_MAXADDR check, >>> or SIZE_MAX? The former is probably preferable for PAE systems. >> >> Wouldn't it be spelled as __LP64__ ? > > It shouldn't be, because the P stands for pointer(s), which we make > 128-bit, though in practice for compatibility we have a hack to define > it anyway (but the compiler *won't*, it's in bsd.cpu.mk or similar). > Only the integer addresses are 128-bit. As for the original comment about the diff, I stand corrected; it's using MAX not SIZE, so will work on CHERI. Jess