Date: Sun, 10 Jan 2021 21:40:21 +0000 From: Jessica Clarke <jrtc27@freebsd.org> To: Konstantin Belousov <kostikbel@gmail.com> Cc: Mitchell Horne <mhorne@freebsd.org>, "src-committers@freebsd.org" <src-committers@freebsd.org>, "dev-commits-src-all@freebsd.org" <dev-commits-src-all@freebsd.org>, "dev-commits-src-main@freebsd.org" <dev-commits-src-main@freebsd.org> Subject: Re: git: facdd1cd2045 - main - cgem: add 64-bit support Message-ID: <6FE70CCD-B854-4D41-B050-B7CBD516067F@freebsd.org> In-Reply-To: <51C7F0DA-0EA2-45EF-A817-53984205C648@freebsd.org> References: <202101102053.10AKrGqv070360@gitrepo.freebsd.org> <B11437E6-5865-460B-92A0-62D82F2BBEFC@freebsd.org> <X/tyGljg0gdzab2K@kib.kiev.ua> <51C7F0DA-0EA2-45EF-A817-53984205C648@freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On 10 Jan 2021, at 21:33, Jessica Clarke <jrtc27@freebsd.org> wrote:
> On 10 Jan 2021, at 21:31, Konstantin Belousov <kostikbel@gmail.com> wrote:
>> On Sun, Jan 10, 2021 at 09:17:48PM +0000, Jessica Clarke wrote:
>>> On 10 Jan 2021, at 20:53, Mitchell Horne <mhorne@FreeBSD.org> 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 <dev/mii/mii.h>
>>>> #include <dev/mii/miivar.h>
>>>>
>>>> +#ifdef EXT_RESOURCES
>>>> +#include <dev/extres/clk/clk.h>
>>>> +#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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6FE70CCD-B854-4D41-B050-B7CBD516067F>