Date: Thu, 24 Oct 2019 04:04:54 +0000 (UTC) From: Kyle Evans <kevans@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r354009 - stable/12/stand/efi/loader Message-ID: <201910240404.x9O44sNd043265@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kevans Date: Thu Oct 24 04:04:53 2019 New Revision: 354009 URL: https://svnweb.freebsd.org/changeset/base/354009 Log: MFC r349471, r351166: Tweak EFI_STAGING_SIZE r349471: Increase EFI_STAGING_SIZE to 100MB on x64 To avoid failures when the large 18MB nvidia.ko module is being loaded, increase EFI_STAGING_SIZE from 64MB to 100MB on x64 systems. Leave the other platforms at 64MB. r351166: Reduce size of EFI_STAGING_SIZE to 32 on arm Reduce the size of the EFI_STAGING area we allocate on arm to 32. On arm SBC such as the NanoPi-NEOLTS the staging area allocation will fail on the 256MB model with a staging size of 64. Modified: stable/12/stand/efi/loader/copy.c Directory Properties: stable/12/ (props changed) Modified: stable/12/stand/efi/loader/copy.c ============================================================================== --- stable/12/stand/efi/loader/copy.c Thu Oct 24 04:00:49 2019 (r354008) +++ stable/12/stand/efi/loader/copy.c Thu Oct 24 04:04:53 2019 (r354009) @@ -176,7 +176,13 @@ out: #endif /* __i386__ || __amd64__ */ #ifndef EFI_STAGING_SIZE +#if defined(__amd64__) +#define EFI_STAGING_SIZE 100 +#elif defined(__arm__) +#define EFI_STAGING_SIZE 32 +#else #define EFI_STAGING_SIZE 64 +#endif #endif EFI_PHYSICAL_ADDRESS staging, staging_end;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201910240404.x9O44sNd043265>