From nobody Sun Oct 23 01:48:21 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Mw1Ls4yc6z4gnhj; Sun, 23 Oct 2022 01:48:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Mw1Ls22gsz3XSf; Sun, 23 Oct 2022 01:48:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666489701; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X2/R80LggpxHaDjTx2Pc0P/PIbdOrvQXfSTjhcKWcCE=; b=beMC/c9fh6vQGLmFFZqtMKnkcGmiyc2wi59BPKKjmOFWTCbShhOQOCfFWSVsHbbKO20vOY gPkiXvyYAZ6eOssQeHytpncoYryLpkrv0hK8Xat1stW4gGwtIS1ccvWm6LTECy4HLOMjXi PlvPTH08Q6xbeKh5t95gtcoVNd4f9ngUrN9qsJu6U6HbbFsWaZKsWtLbboC6EDCvNyPMe9 KVh3rMazjLjuUnEO4+p/CqiXCEMsPh+TR9lAr60MlNatoVD+7vpLmqSTpwdgIxUZHLg3x0 xUwajG8rVFUyJm6TRt6NPvTUMgJVLMhAMyseBtf5hlpOH2YE6qwpcnmQghagnw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Mw1Ls18Jrzkvv; Sun, 23 Oct 2022 01:48:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 29N1mLKa069586; Sun, 23 Oct 2022 01:48:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29N1mLut069585; Sun, 23 Oct 2022 01:48:21 GMT (envelope-from git) Date: Sun, 23 Oct 2022 01:48:21 GMT Message-Id: <202210230148.29N1mLut069585@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: e0c3f66b4d5f - main - stand/efi: Call md_copymodules based on __LP64__ to fix 32-bit arm List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e0c3f66b4d5f0282e9c7c4803c4cd26b5a388a38 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666489701; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X2/R80LggpxHaDjTx2Pc0P/PIbdOrvQXfSTjhcKWcCE=; b=woDvsS6sK7BV2GJ5NPcnclk3HWsS7aKDMXqbk+pSDVOkJwi78obw3U6PZ/adHSRL2eNrpL 4Ucq6zxvkIP1FyO1gCyqHkFuJTzMKjv2qJchYVS3lBbrmShbHHmLlIqw07s2VOebBr3kFP fD4aHe40MUGm18chKNscstDb6b5Yw2H/V02sTTpPAyGlq0IuGn7XAy7+6j91k/0gIseI4k SKIPqnElBYdvOQGbMB+MVNk2+S0IocXvy9gYXr7k8sTxgphylRBGoGSpPYXJBVaYet+7o6 RQj/76VOhW4IqSmGYaLWBQ+Puvx3KXitbUGoEEIlLntOUktymtxRRlNpTkM1Ag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666489701; a=rsa-sha256; cv=none; b=O2DpO0H5Q0vZYn39oqZs+rLs51a0jvkhhot4jvk8UcGuvpsYgBmCloj7imK6IXyFgFTB9k qG2sKBLSrGNg8uidSFv84uxnwFa4mpjkhFAUkj721+c1BKY8mMHNeh53QsFyO8KC8tSxXj NFHIvkkePoPmZM0GTFhZpUcuI7pfiaA8rhr5fxgapRtaAXZxhDoBW3xidvypa3w6MhlTND lgOqhFVn5bQ7I0XTAOBX8VmbILbQQmsCaEF9nASmEWUDb+WT0I4v/CFzyFn+k4J5/BFC6R YKY5otkbKKApyE0CeKpK7qboh5I1PsIB1rHIckNID4z6oQlcOVKad+sa8x2+hA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=e0c3f66b4d5f0282e9c7c4803c4cd26b5a388a38 commit e0c3f66b4d5f0282e9c7c4803c4cd26b5a388a38 Author: Warner Losh AuthorDate: 2022-10-23 01:09:10 +0000 Commit: Warner Losh CommitDate: 2022-10-23 01:47:25 +0000 stand/efi: Call md_copymodules based on __LP64__ to fix 32-bit arm When I refactored everything, I neglected to pass in the proper is64 value on 32-bit platforms. This corrects that. This prevented armv7 and armv6 platforms from booting due to misaligned data in the kernel. The only platform we support 32-bit booting in armv[67], which I apparently neglected to test before commiting my refactoring. Tested by: skibo Fixes: 5d1531d9d4e7d Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D37095 --- stand/efi/loader/bootinfo.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/stand/efi/loader/bootinfo.c b/stand/efi/loader/bootinfo.c index 558f7bdae91e..38175bf10bc5 100644 --- a/stand/efi/loader/bootinfo.c +++ b/stand/efi/loader/bootinfo.c @@ -316,6 +316,7 @@ bi_load(char *args, vm_offset_t *modulep, vm_offset_t *kernendp, bool exit_bs) vm_offset_t size; char *rootdevname; int howto; + bool is64; #if defined(LOADER_FDT_SUPPORT) vm_offset_t dtbp; int dtb_size; @@ -335,6 +336,11 @@ bi_load(char *args, vm_offset_t *modulep, vm_offset_t *kernendp, bool exit_bs) #endif }; #endif +#ifdef __LP64__ + is64 = true; +#else + is64 = false; +#endif howto = bi_getboothowto(args); @@ -413,7 +419,7 @@ bi_load(char *args, vm_offset_t *modulep, vm_offset_t *kernendp, bool exit_bs) #endif bi_load_efi_data(kfp, exit_bs); - size = md_copymodules(0, true); + size = md_copymodules(0, is64); kernend = roundup(addr + size, PAGE_SIZE); *kernendp = kernend; @@ -438,7 +444,7 @@ bi_load(char *args, vm_offset_t *modulep, vm_offset_t *kernendp, bool exit_bs) #endif /* Copy module list and metadata. */ - (void)md_copymodules(addr, true); + (void)md_copymodules(addr, is64); return (0); }