[src/netbsd-9]: src/sys/stand/efiboot Pull up following revision(s) (requeste...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/be0cd496bb35
branches:  netbsd-9
changeset: 454797:be0cd496bb35
user:      martin <martin%NetBSD.org@localhost>
date:      Sat Sep 28 07:24:29 2019 +0000

description:
Pull up following revision(s) (requested by jakllsch in ticket #257):

        sys/stand/efiboot/efiblock.c: revision 1.7

Use roundup2() instead of open coding something almost the same that
truncates 64-bit quantities.

Fixes disk access and booting in bootaa64.efi on SoftIron OverDrive 1000
(which does not have any memory below 4GiB).

diffstat:

 sys/stand/efiboot/efiblock.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (20 lines):

diff -r 846e32b7e380 -r be0cd496bb35 sys/stand/efiboot/efiblock.c
--- a/sys/stand/efiboot/efiblock.c      Sat Sep 28 07:22:16 2019 +0000
+++ b/sys/stand/efiboot/efiblock.c      Sat Sep 28 07:24:29 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: efiblock.c,v 1.5.6.1 2019/09/22 12:37:39 martin Exp $ */
+/* $NetBSD: efiblock.c,v 1.5.6.2 2019/09/28 07:24:29 martin Exp $ */
 
 /*-
  * Copyright (c) 2016 Kimihiro Nonaka <nonaka%netbsd.org@localhost>
@@ -108,8 +108,8 @@
                *buf_start = buf = AllocatePool(size);
        else {
                buf = AllocatePool(size + bdev->bio->Media->IoAlign - 1);
-               *buf_start = (buf == NULL) ? NULL : (void *)(((intptr_t)buf +
-                       bdev->bio->Media->IoAlign - 1) & ~(bdev->bio->Media->IoAlign - 1));
+               *buf_start = (buf == NULL) ? NULL :
+                   (void *)roundup2((intptr_t)buf, bdev->bio->Media->IoAlign);
        }
 
        return buf;