From owner-svn-src-head@freebsd.org Wed Jun 3 16:38:17 2020 Return-Path: Delivered-To: svn-src-head@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 3469D33B2D0; Wed, 3 Jun 2020 16:38:17 +0000 (UTC) (envelope-from mhorne@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49cZN90f83z3X9W; Wed, 3 Jun 2020 16:38:17 +0000 (UTC) (envelope-from mhorne@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1130B11016; Wed, 3 Jun 2020 16:38:17 +0000 (UTC) (envelope-from mhorne@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 053GcGwx091479; Wed, 3 Jun 2020 16:38:16 GMT (envelope-from mhorne@FreeBSD.org) Received: (from mhorne@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 053GcGoJ091478; Wed, 3 Jun 2020 16:38:16 GMT (envelope-from mhorne@FreeBSD.org) Message-Id: <202006031638.053GcGoJ091478@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mhorne set sender to mhorne@FreeBSD.org using -f From: Mitchell Horne Date: Wed, 3 Jun 2020 16:38:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361754 - head/stand/efi/gptboot X-SVN-Group: head X-SVN-Commit-Author: mhorne X-SVN-Commit-Paths: head/stand/efi/gptboot X-SVN-Commit-Revision: 361754 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Jun 2020 16:38:17 -0000 Author: mhorne Date: Wed Jun 3 16:38:16 2020 New Revision: 361754 URL: https://svnweb.freebsd.org/changeset/base/361754 Log: gptboot.efi: align secbuf to 4K The u-boot EFI implementation of the ReadBlocks and WriteBlocks methods requires that the provided buffer meet the IO alignment requirements of the underlying disk. Unlike loader.efi, gptboot.efi doesn't check this requirement, and therefore fails to perform a successful read. Adjust secbuf's alignment to 4K in hopes that we will always meet this requirement. Reviewed by: imp MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D25111 Modified: head/stand/efi/gptboot/proto.c Modified: head/stand/efi/gptboot/proto.c ============================================================================== --- head/stand/efi/gptboot/proto.c Wed Jun 3 14:54:54 2020 (r361753) +++ head/stand/efi/gptboot/proto.c Wed Jun 3 16:38:16 2020 (r361754) @@ -42,7 +42,7 @@ __FBSDID("$FreeBSD$"); #include "gpt.h" #include static const uuid_t freebsd_ufs_uuid = GPT_ENT_TYPE_FREEBSD_UFS; -static char secbuf[4096]; +static char secbuf[4096] __aligned(4096); static struct dsk dsk; static dev_info_t *devices = NULL; static dev_info_t *raw_device = NULL;