git: facdd1cd2045 - main - cgem: add 64-bit support

Jessica Clarke jrtc27 at freebsd.org
Sun Jan 10 21:33:18 UTC 2021


On 10 Jan 2021, at 21:31, Konstantin Belousov <kostikbel at 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 at 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.

Jess



More information about the dev-commits-src-all mailing list