From owner-dev-commits-src-main@freebsd.org Sun Jan 10 21:17:52 2021 Return-Path: Delivered-To: dev-commits-src-main@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 8A9434DA63C for ; Sun, 10 Jan 2021 21:17:52 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.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 4DDV6m3KNKz3k27 for ; Sun, 10 Jan 2021 21:17:52 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: by mail-wm1-f54.google.com with SMTP id c124so12225865wma.5 for ; Sun, 10 Jan 2021 13:17:52 -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=69Wp4A2yerWOslX/H5Gc28GtPXLPLfQw4aG3Wm2Oko0=; b=MDn9RvIgnzzU/9iXGiagVs3N7Yj4S/eXlt4uF8guynFXascYFwQos/+et1XCcPZLPy r72xTXtg9HI3o9QbtXNbpPw2ljSoZrCUcUCFsRYc9dEZv/e4m+prLWLxM6TGUIllR/xO 3l3mJU5iY4Z7tYMZaKWfPWeCmB1ezL6t9pFT/GYvyZCud82d1AJQ/LXDhCMwKHI1F+vp zcrmykKVug98X+NANY946jmT4taIRkka37JiExfp16mrVQ1tTbv0yidJZ3Q3N5nwazn9 MBs/vzyUpeYm9+EO6sqa9L1hrecoAQZQXuhdLL4pLAiZYxJj8V7ya1jh6F7YqiRCPRWh ngYA== X-Gm-Message-State: AOAM5313KJgaOp/wmAZ3JuoKTIO5ZD+QvBxKuAzzChUYI45jIPFdcqb4 KyaSnUn6H3muLek0Pm2pGhQILMfqgswOxRXk X-Google-Smtp-Source: ABdhPJwhhFVAb66x89riPlQj9Od39hQ3Zc625LNzjcdhW8IM01u4r5g6D78eXi02TKAjqjfKwvrZcg== X-Received: by 2002:a1c:7218:: with SMTP id n24mr12049461wmc.186.1610313470918; Sun, 10 Jan 2021 13:17:50 -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 l8sm23595050wrb.73.2021.01.10.13.17.49 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 10 Jan 2021 13:17:50 -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: <202101102053.10AKrGqv070360@gitrepo.freebsd.org> Date: Sun, 10 Jan 2021 21:17:48 +0000 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: 7bit Message-Id: References: <202101102053.10AKrGqv070360@gitrepo.freebsd.org> To: Mitchell Horne X-Mailer: Apple Mail (2.3608.120.23.2.4) X-Rspamd-Queue-Id: 4DDV6m3KNKz3k27 X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Jan 2021 21:17:52 -0000 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. Jess