Use daddr_t and not daddr32_t in boot media.

At a minimum, amd64/i386 should now boot from 4TB GPT formatted disks.

More daddr32_t terminations with extreme prejudice to follow.

Tested by various, in snaps for a few days.

ok deraadt@

86 files changed, 179 insertions, 179 deletions

diff --git a/sys/arch/alpha/stand/boot/disk.c b/sys/arch/alpha/stand/boot/disk.c
index 70ef717602f..a2a1c1c4dd4 100644
--- a/sys/arch/alpha/stand/boot/disk.c
+++ b/sys/arch/alpha/stand/boot/disk.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disk.c,v 1.18 2020/05/25 02:04:48 deraadt Exp $	*/
+/*	$OpenBSD: disk.c,v 1.19 2020/12/09 18:10:17 krw Exp $	*/
 /*	$NetBSD: disk.c,v 1.6 1997/04/06 08:40:33 cgd Exp $	*/
 
 /*
@@ -54,7 +54,7 @@ struct	disk_softc {
 };
 
 int
-diskstrategy(void *devdata, int rw, daddr32_t bn, size_t reqcnt, void *addrvoid,
+diskstrategy(void *devdata, int rw, daddr_t bn, size_t reqcnt, void *addrvoid,
     size_t *cnt)
 {
 	char *addr = addrvoid;
@@ -132,7 +132,7 @@ diskopen(struct open_file *f, int ctlr, int unit, int part)
 	DL_SETPOFFSET(&lp->d_partitions[part], 0);
 	DL_SETPSIZE(&lp->d_partitions[part], 0x7fffffff);
 	i = diskstrategy(sc, F_READ,
-	    (daddr32_t)LABELSECTOR, DEV_BSIZE, buf, &cnt);
+	    LABELSECTOR, DEV_BSIZE, buf, &cnt);
 	if (i || cnt != DEV_BSIZE) {
 		printf("disk%d: error reading disk label\n", unit);
 		goto bad;
diff --git a/sys/arch/alpha/stand/boot/disk.h b/sys/arch/alpha/stand/boot/disk.h
index 17f57613612..6486f3d158e 100644
--- a/sys/arch/alpha/stand/boot/disk.h
+++ b/sys/arch/alpha/stand/boot/disk.h
@@ -1,7 +1,7 @@
-/*	$OpenBSD: disk.h,v 1.5 2011/03/13 00:13:52 deraadt Exp $	*/
+/*	$OpenBSD: disk.h,v 1.6 2020/12/09 18:10:17 krw Exp $	*/
 /*	$NetBSD: disk.h,v 1.1 1995/11/23 02:39:42 cgd Exp $	*/
 
-int	diskstrategy(void *, int, daddr32_t, size_t, void *, size_t *);
+int	diskstrategy(void *, int, daddr_t, size_t, void *, size_t *);
 /* int     diskopen(struct open_file *, int, int, int); */
 int     diskclose(struct open_file *);
 
diff --git a/sys/arch/amd64/stand/boot/conf.c b/sys/arch/amd64/stand/boot/conf.c
index cf518723d53..a40bd230fb2 100644
--- a/sys/arch/amd64/stand/boot/conf.c
+++ b/sys/arch/amd64/stand/boot/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.52 2020/06/14 16:06:25 deraadt Exp $	*/
+/*	$OpenBSD: conf.c,v 1.53 2020/12/09 18:10:17 krw Exp $	*/
 
 /*
  * Copyright (c) 1996 Michael Shalayeff
@@ -41,7 +41,7 @@
 #include <biosdev.h>
 #include <dev/cons.h>
 
-const char version[] = "3.52";
+const char version[] = "3.53";
 int	debug = 1;
 
 
diff --git a/sys/arch/amd64/stand/cdboot/conf.c b/sys/arch/amd64/stand/cdboot/conf.c
index e4674ccb408..9875e59fe0f 100644
--- a/sys/arch/amd64/stand/cdboot/conf.c
+++ b/sys/arch/amd64/stand/cdboot/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.46 2020/06/14 16:06:25 deraadt Exp $	*/
+/*	$OpenBSD: conf.c,v 1.47 2020/12/09 18:10:18 krw Exp $	*/
 
 /*
  * Copyright (c) 2004 Tom Cosgrove
@@ -42,7 +42,7 @@
 #include <biosdev.h>
 #include <dev/cons.h>
 
-const char version[] = "3.52";
+const char version[] = "3.53";
 int	debug = 1;
 
 
diff --git a/sys/arch/amd64/stand/efi32/conf.c b/sys/arch/amd64/stand/efi32/conf.c
index bbbf465e19d..dcf19e147de 100644
--- a/sys/arch/amd64/stand/efi32/conf.c
+++ b/sys/arch/amd64/stand/efi32/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.9 2020/06/14 16:06:25 deraadt Exp $	*/
+/*	$OpenBSD: conf.c,v 1.10 2020/12/09 18:10:18 krw Exp $	*/
 
 /*
  * Copyright (c) 1996 Michael Shalayeff
@@ -40,7 +40,7 @@
 #include "efidev.h"
 #include "efipxe.h"
 
-const char version[] = "3.52";
+const char version[] = "3.53";
 
 #ifdef EFI_DEBUG
 int	debug = 0;
diff --git a/sys/arch/amd64/stand/efi32/diskprobe.c b/sys/arch/amd64/stand/efi32/diskprobe.c
index 7f5c42cd9a1..48f089c296f 100644
--- a/sys/arch/amd64/stand/efi32/diskprobe.c
+++ b/sys/arch/amd64/stand/efi32/diskprobe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: diskprobe.c,v 1.1 2019/05/11 02:33:34 mlarkin Exp $	*/
+/*	$OpenBSD: diskprobe.c,v 1.2 2020/12/09 18:10:18 krw Exp $	*/
 
 /*
  * Copyright (c) 1997 Tobias Weingartner
@@ -295,7 +295,7 @@ check_hibernate(struct diskinfo *dip)
 	    DL_GETPSIZE(&dip->disklabel.d_partitions[1]) -
             (sizeof(union hibernate_info) / DEV_BSIZE);
 
-	error = dip->strategy(dip, F_READ, (daddr32_t)sec, sizeof hib, &hib, NULL);
+	error = dip->strategy(dip, F_READ, sec, sizeof hib, &hib, NULL);
 	if (error == 0 && hib.magic == HIBERNATE_MAGIC)
 		dip->bios_info.flags |= BDI_HIBVALID; /* Hibernate present */
 }
diff --git a/sys/arch/amd64/stand/efi32/efidev.c b/sys/arch/amd64/stand/efi32/efidev.c
index 19915a8993f..e55f6352985 100644
--- a/sys/arch/amd64/stand/efi32/efidev.c
+++ b/sys/arch/amd64/stand/efi32/efidev.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: efidev.c,v 1.1 2019/05/11 02:33:34 mlarkin Exp $	*/
+/*	$OpenBSD: efidev.c,v 1.2 2020/12/09 18:10:18 krw Exp $	*/
 
 /*
  * Copyright (c) 1996 Michael Shalayeff
@@ -710,7 +710,7 @@ efiopen(struct open_file *f, ...)
 }
 
 int
-efistrategy(void *devdata, int rw, daddr32_t blk, size_t size, void *buf,
+efistrategy(void *devdata, int rw, daddr_t blk, size_t size, void *buf,
     size_t *rsize)
 {
 	struct diskinfo *dip = (struct diskinfo *)devdata;
diff --git a/sys/arch/amd64/stand/efi32/efidev.h b/sys/arch/amd64/stand/efi32/efidev.h
index 1c4fe65fb85..48c2e7e82ee 100644
--- a/sys/arch/amd64/stand/efi32/efidev.h
+++ b/sys/arch/amd64/stand/efi32/efidev.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: efidev.h,v 1.1 2019/05/11 02:33:34 mlarkin Exp $	*/
+/*	$OpenBSD: efidev.h,v 1.2 2020/12/09 18:10:18 krw Exp $	*/
 
 /*
  * Copyright (c) 1996 Michael Shalayeff
@@ -32,7 +32,7 @@
 void		 efid_init(struct diskinfo *, void *handle);
 const char	*efi_getdisklabel(efi_diskinfo_t, struct disklabel *);
 int		 efiopen(struct open_file *, ...);
-int		 efistrategy(void *, int, daddr32_t, size_t, void *, size_t *);
+int		 efistrategy(void *, int, daddr_t, size_t, void *, size_t *);
 int		 eficlose(struct open_file *);
 int		 efiioctl(struct open_file *, u_long, void *);
 void		 efi_dump_diskinfo(void);
diff --git a/sys/arch/amd64/stand/efi32/efipxe.c b/sys/arch/amd64/stand/efi32/efipxe.c
index ae82556136b..5bf8c3b0d09 100644
--- a/sys/arch/amd64/stand/efi32/efipxe.c
+++ b/sys/arch/amd64/stand/efi32/efipxe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: efipxe.c,v 1.4 2019/11/26 19:08:01 bluhm Exp $	*/
+/*	$OpenBSD: efipxe.c,v 1.5 2020/12/09 18:10:18 krw Exp $	*/
 /*
  * Copyright (c) 2017 Patrick Wildt <patrick@blueri.se>
  *
@@ -299,7 +299,7 @@ tftpioctl(struct open_file *f, u_long cmd, void *data)
 }
 
 int
-tftpstrategy(void *devdata, int rw, daddr32_t blk, size_t size, void *buf,
+tftpstrategy(void *devdata, int rw, daddr_t blk, size_t size, void *buf,
 	size_t *rsize)
 {
 	return EOPNOTSUPP;
diff --git a/sys/arch/amd64/stand/efi32/efipxe.h b/sys/arch/amd64/stand/efi32/efipxe.h
index b448db8b6f7..34347b03773 100644
--- a/sys/arch/amd64/stand/efi32/efipxe.h
+++ b/sys/arch/amd64/stand/efi32/efipxe.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: efipxe.h,v 1.1 2019/05/11 02:33:34 mlarkin Exp $	*/
+/*	$OpenBSD: efipxe.h,v 1.2 2020/12/09 18:10:18 krw Exp $	*/
 /*
  * Copyright (c) 2017 Patrick Wildt <patrick@blueri.se>
  *
@@ -18,4 +18,4 @@
 int tftpopen(struct open_file *, ...);
 int tftpclose(struct open_file *);
 int tftpioctl(struct open_file *, u_long, void *);
-int tftpstrategy(void *, int, daddr32_t, size_t, void *, size_t *);
+int tftpstrategy(void *, int, daddr_t, size_t, void *, size_t *);
diff --git a/sys/arch/amd64/stand/efi64/conf.c b/sys/arch/amd64/stand/efi64/conf.c
index 359877f1420..4eac75be43a 100644
--- a/sys/arch/amd64/stand/efi64/conf.c
+++ b/sys/arch/amd64/stand/efi64/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.8 2020/06/14 16:06:25 deraadt Exp $	*/
+/*	$OpenBSD: conf.c,v 1.9 2020/12/09 18:10:18 krw Exp $	*/
 
 /*
  * Copyright (c) 1996 Michael Shalayeff
@@ -40,7 +40,7 @@
 #include "efidev.h"
 #include "efipxe.h"
 
-const char version[] = "3.52";
+const char version[] = "3.53";
 
 #ifdef EFI_DEBUG
 int	debug = 0;
diff --git a/sys/arch/amd64/stand/efi64/diskprobe.c b/sys/arch/amd64/stand/efi64/diskprobe.c
index 72f61f295ea..48f089c296f 100644
--- a/sys/arch/amd64/stand/efi64/diskprobe.c
+++ b/sys/arch/amd64/stand/efi64/diskprobe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: diskprobe.c,v 1.1 2019/05/11 02:36:10 mlarkin Exp $	*/
+/*	$OpenBSD: diskprobe.c,v 1.2 2020/12/09 18:10:18 krw Exp $	*/
 
 /*
  * Copyright (c) 1997 Tobias Weingartner
@@ -295,7 +295,7 @@ check_hibernate(struct diskinfo *dip)
 	    DL_GETPSIZE(&dip->disklabel.d_partitions[1]) -
             (sizeof(union hibernate_info) / DEV_BSIZE);
 
-	error = dip->strategy(dip, F_READ, (daddr32_t)sec, sizeof hib, &hib, NULL);
+	error = dip->strategy(dip, F_READ, sec, sizeof hib, &hib, NULL);
 	if (error == 0 && hib.magic == HIBERNATE_MAGIC)
 		dip->bios_info.flags |= BDI_HIBVALID; /* Hibernate present */
 }
diff --git a/sys/arch/amd64/stand/efi64/efidev.c b/sys/arch/amd64/stand/efi64/efidev.c
index 430f019dc27..e55f6352985 100644
--- a/sys/arch/amd64/stand/efi64/efidev.c
+++ b/sys/arch/amd64/stand/efi64/efidev.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: efidev.c,v 1.1 2019/05/11 02:36:10 mlarkin Exp $	*/
+/*	$OpenBSD: efidev.c,v 1.2 2020/12/09 18:10:18 krw Exp $	*/
 
 /*
  * Copyright (c) 1996 Michael Shalayeff
@@ -710,7 +710,7 @@ efiopen(struct open_file *f, ...)
 }
 
 int
-efistrategy(void *devdata, int rw, daddr32_t blk, size_t size, void *buf,
+efistrategy(void *devdata, int rw, daddr_t blk, size_t size, void *buf,
     size_t *rsize)
 {
 	struct diskinfo *dip = (struct diskinfo *)devdata;
diff --git a/sys/arch/amd64/stand/efi64/efidev.h b/sys/arch/amd64/stand/efi64/efidev.h
index 603e3ba1391..48c2e7e82ee 100644
--- a/sys/arch/amd64/stand/efi64/efidev.h
+++ b/sys/arch/amd64/stand/efi64/efidev.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: efidev.h,v 1.1 2019/05/11 02:36:10 mlarkin Exp $	*/
+/*	$OpenBSD: efidev.h,v 1.2 2020/12/09 18:10:18 krw Exp $	*/
 
 /*
  * Copyright (c) 1996 Michael Shalayeff
@@ -32,7 +32,7 @@
 void		 efid_init(struct diskinfo *, void *handle);
 const char	*efi_getdisklabel(efi_diskinfo_t, struct disklabel *);
 int		 efiopen(struct open_file *, ...);
-int		 efistrategy(void *, int, daddr32_t, size_t, void *, size_t *);
+int		 efistrategy(void *, int, daddr_t, size_t, void *, size_t *);
 int		 eficlose(struct open_file *);
 int		 efiioctl(struct open_file *, u_long, void *);
 void		 efi_dump_diskinfo(void);
diff --git a/sys/arch/amd64/stand/efi64/efipxe.c b/sys/arch/amd64/stand/efi64/efipxe.c
index f2f88ff37dd..5bf8c3b0d09 100644
--- a/sys/arch/amd64/stand/efi64/efipxe.c
+++ b/sys/arch/amd64/stand/efi64/efipxe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: efipxe.c,v 1.4 2019/11/26 19:08:02 bluhm Exp $	*/
+/*	$OpenBSD: efipxe.c,v 1.5 2020/12/09 18:10:18 krw Exp $	*/
 /*
  * Copyright (c) 2017 Patrick Wildt <patrick@blueri.se>
  *
@@ -299,7 +299,7 @@ tftpioctl(struct open_file *f, u_long cmd, void *data)
 }
 
 int
-tftpstrategy(void *devdata, int rw, daddr32_t blk, size_t size, void *buf,
+tftpstrategy(void *devdata, int rw, daddr_t blk, size_t size, void *buf,
 	size_t *rsize)
 {
 	return EOPNOTSUPP;
diff --git a/sys/arch/amd64/stand/efi64/efipxe.h b/sys/arch/amd64/stand/efi64/efipxe.h
index 771837eea8a..34347b03773 100644
--- a/sys/arch/amd64/stand/efi64/efipxe.h
+++ b/sys/arch/amd64/stand/efi64/efipxe.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: efipxe.h,v 1.1 2019/05/11 02:36:10 mlarkin Exp $	*/
+/*	$OpenBSD: efipxe.h,v 1.2 2020/12/09 18:10:18 krw Exp $	*/
 /*
  * Copyright (c) 2017 Patrick Wildt <patrick@blueri.se>
  *
@@ -18,4 +18,4 @@
 int tftpopen(struct open_file *, ...);
 int tftpclose(struct open_file *);
 int tftpioctl(struct open_file *, u_long, void *);
-int tftpstrategy(void *, int, daddr32_t, size_t, void *, size_t *);
+int tftpstrategy(void *, int, daddr_t, size_t, void *, size_t *);
diff --git a/sys/arch/amd64/stand/efiboot/conf.c b/sys/arch/amd64/stand/efiboot/conf.c
index 4e28984bb81..f6eb1e2b8e2 100644
--- a/sys/arch/amd64/stand/efiboot/conf.c
+++ b/sys/arch/amd64/stand/efiboot/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.32 2020/10/30 19:39:00 kettenis Exp $	*/
+/*	$OpenBSD: conf.c,v 1.33 2020/12/09 18:10:18 krw Exp $	*/
 
 /*
  * Copyright (c) 1996 Michael Shalayeff
@@ -40,7 +40,7 @@
 #include "efidev.h"
 #include "efipxe.h"
 
-const char version[] = "3.55";
+const char version[] = "3.56";
 
 #ifdef EFI_DEBUG
 int	debug = 0;
diff --git a/sys/arch/amd64/stand/efiboot/diskprobe.c b/sys/arch/amd64/stand/efiboot/diskprobe.c
index 4ddc5ae84a4..48f089c296f 100644
--- a/sys/arch/amd64/stand/efiboot/diskprobe.c
+++ b/sys/arch/amd64/stand/efiboot/diskprobe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: diskprobe.c,v 1.1 2019/05/10 21:20:42 mlarkin Exp $	*/
+/*	$OpenBSD: diskprobe.c,v 1.2 2020/12/09 18:10:18 krw Exp $	*/
 
 /*
  * Copyright (c) 1997 Tobias Weingartner
@@ -295,7 +295,7 @@ check_hibernate(struct diskinfo *dip)
 	    DL_GETPSIZE(&dip->disklabel.d_partitions[1]) -
             (sizeof(union hibernate_info) / DEV_BSIZE);
 
-	error = dip->strategy(dip, F_READ, (daddr32_t)sec, sizeof hib, &hib, NULL);
+	error = dip->strategy(dip, F_READ, sec, sizeof hib, &hib, NULL);
 	if (error == 0 && hib.magic == HIBERNATE_MAGIC)
 		dip->bios_info.flags |= BDI_HIBVALID; /* Hibernate present */
 }
diff --git a/sys/arch/amd64/stand/efiboot/efidev.c b/sys/arch/amd64/stand/efiboot/efidev.c
index e3ac1fe10ee..480f5f52e10 100644
--- a/sys/arch/amd64/stand/efiboot/efidev.c
+++ b/sys/arch/amd64/stand/efiboot/efidev.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: efidev.c,v 1.31 2019/07/29 14:51:39 yasuoka Exp $	*/
+/*	$OpenBSD: efidev.c,v 1.32 2020/12/09 18:10:18 krw Exp $	*/
 
 /*
  * Copyright (c) 1996 Michael Shalayeff
@@ -740,7 +740,7 @@ efiopen(struct open_file *f, ...)
 }
 
 int
-efistrategy(void *devdata, int rw, daddr32_t blk, size_t size, void *buf,
+efistrategy(void *devdata, int rw, daddr_t blk, size_t size, void *buf,
     size_t *rsize)
 {
 	struct diskinfo *dip = (struct diskinfo *)devdata;
diff --git a/sys/arch/amd64/stand/efiboot/efidev.h b/sys/arch/amd64/stand/efiboot/efidev.h
index f9d999d29e8..9c2fdc43a42 100644
--- a/sys/arch/amd64/stand/efiboot/efidev.h
+++ b/sys/arch/amd64/stand/efiboot/efidev.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: efidev.h,v 1.3 2015/11/08 00:42:39 yasuoka Exp $	*/
+/*	$OpenBSD: efidev.h,v 1.4 2020/12/09 18:10:18 krw Exp $	*/
 
 /*
  * Copyright (c) 1996 Michael Shalayeff
@@ -32,7 +32,7 @@
 void		 efid_init(struct diskinfo *, void *handle);
 const char	*efi_getdisklabel(efi_diskinfo_t, struct disklabel *);
 int		 efiopen(struct open_file *, ...);
-int		 efistrategy(void *, int, daddr32_t, size_t, void *, size_t *);
+int		 efistrategy(void *, int, daddr_t, size_t, void *, size_t *);
 int		 eficlose(struct open_file *);
 int		 efiioctl(struct open_file *, u_long, void *);
 void		 efi_dump_diskinfo(void);
diff --git a/sys/arch/amd64/stand/efiboot/efipxe.c b/sys/arch/amd64/stand/efiboot/efipxe.c
index 6f0efccdbd8..e21d0444854 100644
--- a/sys/arch/amd64/stand/efiboot/efipxe.c
+++ b/sys/arch/amd64/stand/efiboot/efipxe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: efipxe.c,v 1.7 2019/11/26 19:08:02 bluhm Exp $	*/
+/*	$OpenBSD: efipxe.c,v 1.8 2020/12/09 18:10:18 krw Exp $	*/
 /*
  * Copyright (c) 2017 Patrick Wildt <patrick@blueri.se>
  *
@@ -299,7 +299,7 @@ tftpioctl(struct open_file *f, u_long cmd, void *data)
 }
 
 int
-tftpstrategy(void *devdata, int rw, daddr32_t blk, size_t size, void *buf,
+tftpstrategy(void *devdata, int rw, daddr_t blk, size_t size, void *buf,
 	size_t *rsize)
 {
 	return EOPNOTSUPP;
diff --git a/sys/arch/amd64/stand/efiboot/efipxe.h b/sys/arch/amd64/stand/efiboot/efipxe.h
index 9f1ebedb3c6..ec10b1bf297 100644
--- a/sys/arch/amd64/stand/efiboot/efipxe.h
+++ b/sys/arch/amd64/stand/efiboot/efipxe.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: efipxe.h,v 1.2 2018/01/21 21:37:01 patrick Exp $	*/
+/*	$OpenBSD: efipxe.h,v 1.3 2020/12/09 18:10:18 krw Exp $	*/
 /*
  * Copyright (c) 2017 Patrick Wildt <patrick@blueri.se>
  *
@@ -18,4 +18,4 @@
 int tftpopen(struct open_file *, ...);
 int tftpclose(struct open_file *);
 int tftpioctl(struct open_file *, u_long, void *);
-int tftpstrategy(void *, int, daddr32_t, size_t, void *, size_t *);
+int tftpstrategy(void *, int, daddr_t, size_t, void *, size_t *);
diff --git a/sys/arch/amd64/stand/libsa/biosdev.c b/sys/arch/amd64/stand/libsa/biosdev.c
index fdd1c90170a..b64714b20e0 100644
--- a/sys/arch/amd64/stand/libsa/biosdev.c
+++ b/sys/arch/amd64/stand/libsa/biosdev.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: biosdev.c,v 1.33 2018/12/16 08:33:16 otto Exp $	*/
+/*	$OpenBSD: biosdev.c,v 1.34 2020/12/09 18:10:18 krw Exp $	*/
 
 /*
  * Copyright (c) 1996 Michael Shalayeff
@@ -726,7 +726,7 @@ biosdisk_errno(u_int error)
 }
 
 int
-biosstrategy(void *devdata, int rw, daddr32_t blk, size_t size, void *buf,
+biosstrategy(void *devdata, int rw, daddr_t blk, size_t size, void *buf,
     size_t *rsize)
 {
 	struct diskinfo *dip = (struct diskinfo *)devdata;
diff --git a/sys/arch/amd64/stand/libsa/biosdev.h b/sys/arch/amd64/stand/libsa/biosdev.h
index 5a7884130bb..33277e1df54 100644
--- a/sys/arch/amd64/stand/libsa/biosdev.h
+++ b/sys/arch/amd64/stand/libsa/biosdev.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: biosdev.h,v 1.5 2015/09/02 01:52:26 yasuoka Exp $	*/
+/*	$OpenBSD: biosdev.h,v 1.6 2020/12/09 18:10:18 krw Exp $	*/
 
 /*
  * Copyright (c) 1996 Michael Shalayeff
@@ -45,7 +45,7 @@ struct diskinfo;
 
 /* biosdev.c */
 extern const char *biosdevs[];
-int biosstrategy(void *, int, daddr32_t, size_t, void *, size_t *);
+int biosstrategy(void *, int, daddr_t, size_t, void *, size_t *);
 int biosopen(struct open_file *, ...);
 int biosclose(struct open_file *);
 int biosioctl(struct open_file *, u_long, void *);
diff --git a/sys/arch/amd64/stand/libsa/disk.h b/sys/arch/amd64/stand/libsa/disk.h
index ea73630254d..911dd1ef07b 100644
--- a/sys/arch/amd64/stand/libsa/disk.h
+++ b/sys/arch/amd64/stand/libsa/disk.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disk.h,v 1.6 2017/07/21 01:21:42 yasuoka Exp $	*/
+/*	$OpenBSD: disk.h,v 1.7 2020/12/09 18:10:18 krw Exp $	*/
 
 /*
  * Copyright (c) 1997 Tobias Weingartner
@@ -43,7 +43,7 @@ struct diskinfo {
 	struct sr_boot_volume *sr_vol;
 
 	int (*diskio)(int, struct diskinfo *, u_int, int, void *);
-	int (*strategy)(void *, int, daddr32_t, size_t, void *, size_t *);
+	int (*strategy)(void *, int, daddr_t, size_t, void *, size_t *);
 
 	dev_t bsddev, bootdev;
 
diff --git a/sys/arch/amd64/stand/libsa/diskprobe.c b/sys/arch/amd64/stand/libsa/diskprobe.c
index 83626e60851..ec274ec62f2 100644
--- a/sys/arch/amd64/stand/libsa/diskprobe.c
+++ b/sys/arch/amd64/stand/libsa/diskprobe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: diskprobe.c,v 1.25 2019/06/24 02:52:58 mlarkin Exp $	*/
+/*	$OpenBSD: diskprobe.c,v 1.26 2020/12/09 18:10:18 krw Exp $	*/
 
 /*
  * Copyright (c) 1997 Tobias Weingartner
@@ -406,7 +406,7 @@ check_hibernate(struct diskinfo *dip)
 	    DL_GETPSIZE(&dip->disklabel.d_partitions[1]) -
             (sizeof(union hibernate_info) / DEV_BSIZE);
 
-	error = dip->strategy(dip, F_READ, (daddr32_t)sec, sizeof hib, &hib,
+	error = dip->strategy(dip, F_READ, sec, sizeof hib, &hib,
 	    NULL);
 	if (error == 0 && hib.magic == HIBERNATE_MAGIC)
 		dip->bios_info.flags |= BDI_HIBVALID; /* Hibernate present */
diff --git a/sys/arch/amd64/stand/libsa/pxe_net.c b/sys/arch/amd64/stand/libsa/pxe_net.c
index 31b7a62cd5a..8c70284fe07 100644
--- a/sys/arch/amd64/stand/libsa/pxe_net.c
+++ b/sys/arch/amd64/stand/libsa/pxe_net.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pxe_net.c,v 1.4 2014/08/21 14:24:08 mpi Exp $	*/
+/*	$OpenBSD: pxe_net.c,v 1.5 2020/12/09 18:10:18 krw Exp $	*/
 /*	$NetBSD: dev_net.c,v 1.4 2003/03/12 13:15:08 drochner Exp $	*/
 
 /*-
@@ -143,7 +143,7 @@ net_ioctl(struct open_file *f, u_long cmd, void *data)
 }
 
 int
-net_strategy(void *devdata, int rw, daddr32_t blk, size_t size, void *buf,
+net_strategy(void *devdata, int rw, daddr_t blk, size_t size, void *buf,
     size_t *rsize)
 {
 	return EIO;
diff --git a/sys/arch/amd64/stand/libsa/pxe_net.h b/sys/arch/amd64/stand/libsa/pxe_net.h
index 49efe81560d..c412cb94b64 100644
--- a/sys/arch/amd64/stand/libsa/pxe_net.h
+++ b/sys/arch/amd64/stand/libsa/pxe_net.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pxe_net.h,v 1.3 2011/03/13 00:13:52 deraadt Exp $	*/
+/*	$OpenBSD: pxe_net.h,v 1.4 2020/12/09 18:10:18 krw Exp $	*/
 /*	$NetBSD$	*/
 
 /*-
@@ -34,4 +34,4 @@
 int	net_open(struct open_file *, ...);
 int	net_close(struct open_file *);
 int	net_ioctl(struct open_file *, u_long, void *);
-int	net_strategy(void *, int , daddr32_t , size_t, void *, size_t *);
+int	net_strategy(void *, int , daddr_t , size_t, void *, size_t *);
diff --git a/sys/arch/amd64/stand/libsa/softraid_amd64.c b/sys/arch/amd64/stand/libsa/softraid_amd64.c
index e117cd5a52f..7cc13c1312e 100644
--- a/sys/arch/amd64/stand/libsa/softraid_amd64.c
+++ b/sys/arch/amd64/stand/libsa/softraid_amd64.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: softraid_amd64.c,v 1.5 2017/12/18 12:53:33 fcambus Exp $	*/
+/*	$OpenBSD: softraid_amd64.c,v 1.6 2020/12/09 18:10:18 krw Exp $	*/
 
 /*
  * Copyright (c) 2012 Joel Sing <jsing@openbsd.org>
@@ -309,7 +309,7 @@ srprobe(void)
 }
 
 int
-sr_strategy(struct sr_boot_volume *bv, int rw, daddr32_t blk, size_t size,
+sr_strategy(struct sr_boot_volume *bv, int rw, daddr_t blk, size_t size,
     void *buf, size_t *rsize)
 {
 	struct diskinfo *sr_dip, *dip;
diff --git a/sys/arch/amd64/stand/libsa/softraid_amd64.h b/sys/arch/amd64/stand/libsa/softraid_amd64.h
index 031fda43955..d1cf2cea99e 100644
--- a/sys/arch/amd64/stand/libsa/softraid_amd64.h
+++ b/sys/arch/amd64/stand/libsa/softraid_amd64.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: softraid_amd64.h,v 1.3 2016/09/11 17:51:21 jsing Exp $	*/
+/*	$OpenBSD: softraid_amd64.h,v 1.4 2020/12/09 18:10:18 krw Exp $	*/
 
 /*
  * Copyright (c) 2012 Joel Sing <jsing@openbsd.org>
@@ -22,7 +22,7 @@
 void	srprobe(void);
 
 const char *sr_getdisklabel(struct sr_boot_volume *, struct disklabel *);
-int	sr_strategy(struct sr_boot_volume *, int, daddr32_t, size_t,
+int	sr_strategy(struct sr_boot_volume *, int, daddr_t, size_t,
 	    void *, size_t *);
 
 #endif /* _SOFTRAID_AMD64_H */
diff --git a/sys/arch/amd64/stand/pxeboot/conf.c b/sys/arch/amd64/stand/pxeboot/conf.c
index 4f80a813501..4d40cc17e88 100644
--- a/sys/arch/amd64/stand/pxeboot/conf.c
+++ b/sys/arch/amd64/stand/pxeboot/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.51 2020/06/14 16:06:25 deraadt Exp $	*/
+/*	$OpenBSD: conf.c,v 1.52 2020/12/09 18:10:18 krw Exp $	*/
 
 /*
  * Copyright (c) 2004 Tom Cosgrove
@@ -44,7 +44,7 @@
 #include "pxeboot.h"
 #include "pxe_net.h"
 
-const char version[] = "3.52";
+const char version[] = "3.53";
 int	debug = 0;
 
 void (*sa_cleanup)(void) = pxe_shutdown;
diff --git a/sys/arch/arm64/stand/efiboot/conf.c b/sys/arch/arm64/stand/efiboot/conf.c
index f4d3e0dd3cb..2de9bccc576 100644
--- a/sys/arch/arm64/stand/efiboot/conf.c
+++ b/sys/arch/arm64/stand/efiboot/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.30 2020/05/26 14:00:42 deraadt Exp $	*/
+/*	$OpenBSD: conf.c,v 1.31 2020/12/09 18:10:18 krw Exp $	*/
 
 /*
  * Copyright (c) 1996 Michael Shalayeff
@@ -46,7 +46,7 @@
 #include "efipxe.h"
 #include "softraid_arm64.h"
 
-const char version[] = "1.2";
+const char version[] = "1.3";
 int	debug = 0;
 
 struct fs_ops file_system[] = {
diff --git a/sys/arch/arm64/stand/efiboot/disk.h b/sys/arch/arm64/stand/efiboot/disk.h
index 8e5fd1d0541..6d6989e8683 100644
--- a/sys/arch/arm64/stand/efiboot/disk.h
+++ b/sys/arch/arm64/stand/efiboot/disk.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: disk.h,v 1.2 2019/01/31 14:35:06 patrick Exp $ */
+/* $OpenBSD: disk.h,v 1.3 2020/12/09 18:10:18 krw Exp $ */
 
 #ifndef _DISK_H
 #define _DISK_H
@@ -20,7 +20,7 @@ struct diskinfo {
 #define DISKINFO_FLAG_GOODLABEL		(1 << 0)
 
 	int (*diskio)(int, struct diskinfo *, u_int, int, void *);
-	int (*strategy)(void *, int, daddr32_t, size_t, void *, size_t *);
+	int (*strategy)(void *, int, daddr_t, size_t, void *, size_t *);
 
 	TAILQ_ENTRY(diskinfo) list;
 };
diff --git a/sys/arch/arm64/stand/efiboot/efidev.c b/sys/arch/arm64/stand/efiboot/efidev.c
index dbbbb1c313a..b79d6bac071 100644
--- a/sys/arch/arm64/stand/efiboot/efidev.c
+++ b/sys/arch/arm64/stand/efiboot/efidev.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: efidev.c,v 1.5 2019/07/29 22:33:26 yasuoka Exp $	*/
+/*	$OpenBSD: efidev.c,v 1.6 2020/12/09 18:10:18 krw Exp $	*/
 
 /*
  * Copyright (c) 2015 YASUOKA Masahiko <yasuoka@yasuoka.net>
@@ -521,7 +521,7 @@ efiopen(struct open_file *f, ...)
 }
 
 int
-efistrategy(void *devdata, int rw, daddr32_t blk, size_t size, void *buf,
+efistrategy(void *devdata, int rw, daddr_t blk, size_t size, void *buf,
     size_t *rsize)
 {
 	struct diskinfo *dip = (struct diskinfo *)devdata;
diff --git a/sys/arch/arm64/stand/efiboot/efidev.h b/sys/arch/arm64/stand/efiboot/efidev.h
index e7e4e458adb..6f8ee047b90 100644
--- a/sys/arch/arm64/stand/efiboot/efidev.h
+++ b/sys/arch/arm64/stand/efiboot/efidev.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: efidev.h,v 1.2 2019/01/31 14:35:06 patrick Exp $	*/
+/*	$OpenBSD: efidev.h,v 1.3 2020/12/09 18:10:18 krw Exp $	*/
 
 /*
  * Copyright (c) 1996 Michael Shalayeff
@@ -31,6 +31,6 @@
 /* efidev.c */
 void		 efid_init(struct diskinfo *, void *handle);
 int		 efiopen(struct open_file *, ...);
-int		 efistrategy(void *, int, daddr32_t, size_t, void *, size_t *);
+int		 efistrategy(void *, int, daddr_t, size_t, void *, size_t *);
 int		 eficlose(struct open_file *);
 int		 efiioctl(struct open_file *, u_long, void *);
diff --git a/sys/arch/arm64/stand/efiboot/efipxe.c b/sys/arch/arm64/stand/efiboot/efipxe.c
index 9acf452ab8b..f8f2384c3ba 100644
--- a/sys/arch/arm64/stand/efiboot/efipxe.c
+++ b/sys/arch/arm64/stand/efiboot/efipxe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: efipxe.c,v 1.8 2020/05/18 12:14:33 patrick Exp $	*/
+/*	$OpenBSD: efipxe.c,v 1.9 2020/12/09 18:10:18 krw Exp $	*/
 /*
  * Copyright (c) 2017 Patrick Wildt <patrick@blueri.se>
  *
@@ -366,7 +366,7 @@ tftpioctl(struct open_file *f, u_long cmd, void *data)
 }
 
 int
-tftpstrategy(void *devdata, int rw, daddr32_t blk, size_t size, void *buf,
+tftpstrategy(void *devdata, int rw, daddr_t blk, size_t size, void *buf,
 	size_t *rsize)
 {
 	return EOPNOTSUPP;
diff --git a/sys/arch/arm64/stand/efiboot/efipxe.h b/sys/arch/arm64/stand/efiboot/efipxe.h
index 70c91b6677f..fa491a9bea1 100644
--- a/sys/arch/arm64/stand/efiboot/efipxe.h
+++ b/sys/arch/arm64/stand/efiboot/efipxe.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: efipxe.h,v 1.2 2018/03/31 17:43:53 patrick Exp $	*/
+/*	$OpenBSD: efipxe.h,v 1.3 2020/12/09 18:10:18 krw Exp $	*/
 /*
  * Copyright (c) 2017 Patrick Wildt <patrick@blueri.se>
  *
@@ -30,4 +30,4 @@ int	 mtftp_readdir(struct open_file *, char *);
 int	 tftpopen(struct open_file *, ...);
 int	 tftpclose(struct open_file *);
 int	 tftpioctl(struct open_file *, u_long, void *);
-int	 tftpstrategy(void *, int, daddr32_t, size_t, void *, size_t *);
+int	 tftpstrategy(void *, int, daddr_t, size_t, void *, size_t *);
diff --git a/sys/arch/arm64/stand/efiboot/softraid_arm64.c b/sys/arch/arm64/stand/efiboot/softraid_arm64.c
index 4b36b835948..243543904fd 100644
--- a/sys/arch/arm64/stand/efiboot/softraid_arm64.c
+++ b/sys/arch/arm64/stand/efiboot/softraid_arm64.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: softraid_arm64.c,v 1.1 2019/01/31 14:35:06 patrick Exp $	*/
+/*	$OpenBSD: softraid_arm64.c,v 1.2 2020/12/09 18:10:18 krw Exp $	*/
 
 /*
  * Copyright (c) 2012 Joel Sing <jsing@openbsd.org>
@@ -303,7 +303,7 @@ srprobe(void)
 }
 
 int
-sr_strategy(struct sr_boot_volume *bv, int rw, daddr32_t blk, size_t size,
+sr_strategy(struct sr_boot_volume *bv, int rw, daddr_t blk, size_t size,
     void *buf, size_t *rsize)
 {
 	struct diskinfo *sr_dip, *dip;
@@ -637,7 +637,7 @@ sropen(struct open_file *f, ...)
 }
 
 int
-srstrategy(void *devdata, int rw, daddr32_t blk, size_t size, void *buf,
+srstrategy(void *devdata, int rw, daddr_t blk, size_t size, void *buf,
     size_t *rsize)
 {
 	struct diskinfo *dip = (struct diskinfo *)devdata;
diff --git a/sys/arch/arm64/stand/efiboot/softraid_arm64.h b/sys/arch/arm64/stand/efiboot/softraid_arm64.h
index cb480341871..55cc00f46da 100644
--- a/sys/arch/arm64/stand/efiboot/softraid_arm64.h
+++ b/sys/arch/arm64/stand/efiboot/softraid_arm64.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: softraid_arm64.h,v 1.1 2019/01/31 14:35:06 patrick Exp $	*/
+/*	$OpenBSD: softraid_arm64.h,v 1.2 2020/12/09 18:10:18 krw Exp $	*/
 
 /*
  * Copyright (c) 2012 Joel Sing <jsing@openbsd.org>
@@ -22,10 +22,10 @@
 void	srprobe(void);
 
 const char *sr_getdisklabel(struct sr_boot_volume *, struct disklabel *);
-int	sr_strategy(struct sr_boot_volume *, int, daddr32_t, size_t,
+int	sr_strategy(struct sr_boot_volume *, int, daddr_t, size_t,
 	    void *, size_t *);
 int	sropen(struct open_file *, ...);
-int	srstrategy(void *, int, daddr32_t, size_t, void *, size_t *);
+int	srstrategy(void *, int, daddr_t, size_t, void *, size_t *);
 int	srdiskio(int, struct diskinfo *, u_int, int, void *);
 int	srclose(struct open_file *);
 int	srioctl(struct open_file *, u_long, void *);
diff --git a/sys/arch/armv7/stand/efiboot/conf.c b/sys/arch/armv7/stand/efiboot/conf.c
index 21d49ed7cf1..696c1de4c11 100644
--- a/sys/arch/armv7/stand/efiboot/conf.c
+++ b/sys/arch/armv7/stand/efiboot/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.28 2020/05/26 14:00:42 deraadt Exp $	*/
+/*	$OpenBSD: conf.c,v 1.29 2020/12/09 18:10:18 krw Exp $	*/
 
 /*
  * Copyright (c) 1996 Michael Shalayeff
@@ -42,7 +42,7 @@
 #include "efidev.h"
 #include "efipxe.h"
 
-const char version[] = "1.15";
+const char version[] = "1.16";
 int	debug = 0;
 
 struct fs_ops file_system[] = {
diff --git a/sys/arch/armv7/stand/efiboot/disk.h b/sys/arch/armv7/stand/efiboot/disk.h
index 8832ab519a3..3435ce24b0a 100644
--- a/sys/arch/armv7/stand/efiboot/disk.h
+++ b/sys/arch/armv7/stand/efiboot/disk.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: disk.h,v 1.3 2020/01/13 10:17:09 kettenis Exp $ */
+/* $OpenBSD: disk.h,v 1.4 2020/12/09 18:10:18 krw Exp $ */
 
 #ifndef _DISK_H
 #define _DISK_H
@@ -19,7 +19,7 @@ struct diskinfo {
 #define DISKINFO_FLAG_GOODLABEL		(1 << 0)
 
 	int (*diskio)(int, struct diskinfo *, u_int, int, void *);
-	int (*strategy)(void *, int, daddr32_t, size_t, void *, size_t *);
+	int (*strategy)(void *, int, daddr_t, size_t, void *, size_t *);
 
 	TAILQ_ENTRY(diskinfo) list;
 };
diff --git a/sys/arch/armv7/stand/efiboot/efidev.c b/sys/arch/armv7/stand/efiboot/efidev.c
index 928c57d7d7a..b79d6bac071 100644
--- a/sys/arch/armv7/stand/efiboot/efidev.c
+++ b/sys/arch/armv7/stand/efiboot/efidev.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: efidev.c,v 1.5 2020/01/13 10:17:09 kettenis Exp $	*/
+/*	$OpenBSD: efidev.c,v 1.6 2020/12/09 18:10:18 krw Exp $	*/
 
 /*
  * Copyright (c) 2015 YASUOKA Masahiko <yasuoka@yasuoka.net>
@@ -521,7 +521,7 @@ efiopen(struct open_file *f, ...)
 }
 
 int
-efistrategy(void *devdata, int rw, daddr32_t blk, size_t size, void *buf,
+efistrategy(void *devdata, int rw, daddr_t blk, size_t size, void *buf,
     size_t *rsize)
 {
 	struct diskinfo *dip = (struct diskinfo *)devdata;
diff --git a/sys/arch/armv7/stand/efiboot/efidev.h b/sys/arch/armv7/stand/efiboot/efidev.h
index a7d5dcac90b..eda898053d4 100644
--- a/sys/arch/armv7/stand/efiboot/efidev.h
+++ b/sys/arch/armv7/stand/efiboot/efidev.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: efidev.h,v 1.3 2020/01/13 10:17:09 kettenis Exp $	*/
+/*	$OpenBSD: efidev.h,v 1.4 2020/12/09 18:10:18 krw Exp $	*/
 
 /*
  * Copyright (c) 1996 Michael Shalayeff
@@ -31,6 +31,6 @@
 /* efidev.c */
 void		 efid_init(struct diskinfo *, void *handle);
 int		 efiopen(struct open_file *, ...);
-int		 efistrategy(void *, int, daddr32_t, size_t, void *, size_t *);
+int		 efistrategy(void *, int, daddr_t, size_t, void *, size_t *);
 int		 eficlose(struct open_file *);
 int		 efiioctl(struct open_file *, u_long, void *);
diff --git a/sys/arch/armv7/stand/efiboot/efipxe.c b/sys/arch/armv7/stand/efiboot/efipxe.c
index 9a908cf775e..bb3525ff9e7 100644
--- a/sys/arch/armv7/stand/efiboot/efipxe.c
+++ b/sys/arch/armv7/stand/efiboot/efipxe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: efipxe.c,v 1.5 2020/05/18 12:14:33 patrick Exp $	*/
+/*	$OpenBSD: efipxe.c,v 1.6 2020/12/09 18:10:18 krw Exp $	*/
 /*
  * Copyright (c) 2017 Patrick Wildt <patrick@blueri.se>
  *
@@ -366,7 +366,7 @@ tftpioctl(struct open_file *f, u_long cmd, void *data)
 }
 
 int
-tftpstrategy(void *devdata, int rw, daddr32_t blk, size_t size, void *buf,
+tftpstrategy(void *devdata, int rw, daddr_t blk, size_t size, void *buf,
 	size_t *rsize)
 {
 	return EOPNOTSUPP;
diff --git a/sys/arch/armv7/stand/efiboot/efipxe.h b/sys/arch/armv7/stand/efiboot/efipxe.h
index 0b643dc3b8c..d807138d46c 100644
--- a/sys/arch/armv7/stand/efiboot/efipxe.h
+++ b/sys/arch/armv7/stand/efiboot/efipxe.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: efipxe.h,v 1.1 2018/03/31 18:19:12 patrick Exp $	*/
+/*	$OpenBSD: efipxe.h,v 1.2 2020/12/09 18:10:18 krw Exp $	*/
 /*
  * Copyright (c) 2017 Patrick Wildt <patrick@blueri.se>
  *
@@ -30,4 +30,4 @@ int	 mtftp_readdir(struct open_file *, char *);
 int	 tftpopen(struct open_file *, ...);
 int	 tftpclose(struct open_file *);
 int	 tftpioctl(struct open_file *, u_long, void *);
-int	 tftpstrategy(void *, int, daddr32_t, size_t, void *, size_t *);
+int	 tftpstrategy(void *, int, daddr_t, size_t, void *, size_t *);
diff --git a/sys/arch/hppa/stand/boot/conf.c b/sys/arch/hppa/stand/boot/conf.c
index d371b8d127f..21f5c8bd916 100644
--- a/sys/arch/hppa/stand/boot/conf.c
+++ b/sys/arch/hppa/stand/boot/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.36 2020/05/26 14:00:42 deraadt Exp $	*/
+/*	$OpenBSD: conf.c,v 1.37 2020/12/09 18:10:18 krw Exp $	*/
 
 /*
  * Copyright (c) 1998-2004 Michael Shalayeff
@@ -33,7 +33,7 @@
 #include <lib/libsa/cd9660.h>
 #include <dev/cons.h>
 
-const char version[] = "1.10";
+const char version[] = "1.11";
 int	debug = 0;
 
 struct fs_ops file_system[] = {
diff --git a/sys/arch/hppa/stand/libsa/libsa.h b/sys/arch/hppa/stand/libsa/libsa.h
index 4cb466eff1f..030fc991972 100644
--- a/sys/arch/hppa/stand/libsa/libsa.h
+++ b/sys/arch/hppa/stand/libsa/libsa.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: libsa.h,v 1.15 2019/04/10 04:17:35 deraadt Exp $	*/
+/*	$OpenBSD: libsa.h,v 1.16 2020/12/09 18:10:18 krw Exp $	*/
 
 /*
  * Copyright (c) 1998-2004 Michael Shalayeff
@@ -39,7 +39,7 @@ void pdc_init(void);
 struct pz_device;
 struct pz_device *pdc_findev(int, int);
 
-int iodcstrategy(void *, int, daddr32_t, size_t, void *, size_t *);
+int iodcstrategy(void *, int, daddr_t, size_t, void *, size_t *);
 
 int ctopen(struct open_file *, ...);
 int ctclose(struct open_file *);
@@ -48,7 +48,7 @@ int dkopen(struct open_file *, ...);
 int dkclose(struct open_file *);
 
 int lfopen(struct open_file *, ...);
-int lfstrategy(void *, int, daddr32_t, size_t, void *, size_t *);
+int lfstrategy(void *, int, daddr_t, size_t, void *, size_t *);
 int lfclose(struct open_file *);
 
 void ite_probe(struct consdev *);
diff --git a/sys/arch/hppa/stand/libsa/pdc.c b/sys/arch/hppa/stand/libsa/pdc.c
index 6926e1ab001..668b4a1e6f0 100644
--- a/sys/arch/hppa/stand/libsa/pdc.c
+++ b/sys/arch/hppa/stand/libsa/pdc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pdc.c,v 1.22 2020/05/26 13:38:07 deraadt Exp $	*/
+/*	$OpenBSD: pdc.c,v 1.23 2020/12/09 18:10:18 krw Exp $	*/
 
 /*
  * Copyright (c) 1998-2004 Michael Shalayeff
@@ -128,7 +128,7 @@ int
 iodcstrategy(devdata, rw, blk, size, buf, rsize)
 	void *devdata;
 	int rw;
-	daddr32_t blk;
+	daddr_t blk;
 	size_t size;
 	void *buf;
 	size_t *rsize;
@@ -232,7 +232,7 @@ iodcstrategy(devdata, rw, blk, size, buf, rsize)
 		if ((ret = ((iodcio_t)pzdev->pz_iodc_io)(pzdev->pz_hpa,
 		    (rw == F_READ? IODC_IO_READ: IODC_IO_WRITE),
 		    pzdev->pz_spa, pzdev->pz_layers, pdcbuf,
-		    blk - offset, dp->buf, IODC_IOSIZ, IODC_IOSIZ)) < 0) {
+		    (u_int)blk - offset, dp->buf, IODC_IOSIZ, IODC_IOSIZ)) < 0) {
 #ifdef DEBUG
 			if (debug)
 				printf("iodc_read(%d,%d): %d\n",
diff --git a/sys/arch/i386/stand/boot/conf.c b/sys/arch/i386/stand/boot/conf.c
index 22b14e1bb7a..ab2cf8b81cd 100644
--- a/sys/arch/i386/stand/boot/conf.c
+++ b/sys/arch/i386/stand/boot/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.75 2020/06/14 16:06:25 deraadt Exp $	*/
+/*	$OpenBSD: conf.c,v 1.76 2020/12/09 18:10:18 krw Exp $	*/
 
 /*
  * Copyright (c) 1996 Michael Shalayeff
@@ -42,7 +42,7 @@
 #include <dev/cons.h>
 #include "debug.h"
 
-const char version[] = "3.43";
+const char version[] = "3.44";
 int	debug = 1;
 
 
diff --git a/sys/arch/i386/stand/cdboot/conf.c b/sys/arch/i386/stand/cdboot/conf.c
index f914253d4d6..04444293a3b 100644
--- a/sys/arch/i386/stand/cdboot/conf.c
+++ b/sys/arch/i386/stand/cdboot/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.42 2020/06/14 16:06:25 deraadt Exp $	*/
+/*	$OpenBSD: conf.c,v 1.43 2020/12/09 18:10:18 krw Exp $	*/
 
 /*
  * Copyright (c) 2004 Tom Cosgrove
@@ -43,7 +43,7 @@
 #include <dev/cons.h>
 #include "debug.h"
 
-const char version[] = "3.43";
+const char version[] = "3.44";
 int	debug = 1;
 
 void (*sa_cleanup)(void) = NULL;
diff --git a/sys/arch/i386/stand/libsa/biosdev.c b/sys/arch/i386/stand/libsa/biosdev.c
index 394fc6b061d..d4031c4608e 100644
--- a/sys/arch/i386/stand/libsa/biosdev.c
+++ b/sys/arch/i386/stand/libsa/biosdev.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: biosdev.c,v 1.99 2018/12/16 08:33:16 otto Exp $	*/
+/*	$OpenBSD: biosdev.c,v 1.100 2020/12/09 18:10:18 krw Exp $	*/
 
 /*
  * Copyright (c) 1996 Michael Shalayeff
@@ -727,7 +727,7 @@ biosdisk_errno(u_int error)
 }
 
 int
-biosstrategy(void *devdata, int rw, daddr32_t blk, size_t size, void *buf,
+biosstrategy(void *devdata, int rw, daddr_t blk, size_t size, void *buf,
     size_t *rsize)
 {
 	struct diskinfo *dip = (struct diskinfo *)devdata;
diff --git a/sys/arch/i386/stand/libsa/biosdev.h b/sys/arch/i386/stand/libsa/biosdev.h
index 96a812b10e9..588f03150cc 100644
--- a/sys/arch/i386/stand/libsa/biosdev.h
+++ b/sys/arch/i386/stand/libsa/biosdev.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: biosdev.h,v 1.34 2015/09/02 04:09:24 yasuoka Exp $	*/
+/*	$OpenBSD: biosdev.h,v 1.35 2020/12/09 18:10:18 krw Exp $	*/
 
 /*
  * Copyright (c) 1996 Michael Shalayeff
@@ -45,7 +45,7 @@ struct diskinfo;
 
 /* biosdev.c */
 extern const char *biosdevs[];
-int biosstrategy(void *, int, daddr32_t, size_t, void *, size_t *);
+int biosstrategy(void *, int, daddr_t, size_t, void *, size_t *);
 int biosopen(struct open_file *, ...);
 int biosclose(struct open_file *);
 int biosioctl(struct open_file *, u_long, void *);
diff --git a/sys/arch/i386/stand/libsa/disk.h b/sys/arch/i386/stand/libsa/disk.h
index 0480574b37d..5d46a506d56 100644
--- a/sys/arch/i386/stand/libsa/disk.h
+++ b/sys/arch/i386/stand/libsa/disk.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disk.h,v 1.7 2017/07/21 01:21:42 yasuoka Exp $	*/
+/*	$OpenBSD: disk.h,v 1.8 2020/12/09 18:10:18 krw Exp $	*/
 
 /*
  * Copyright (c) 1997 Tobias Weingartner
@@ -43,7 +43,7 @@ struct diskinfo {
 	struct sr_boot_volume *sr_vol;
 
 	int (*diskio)(int, struct diskinfo *, u_int, int, void *);
-	int (*strategy)(void *, int, daddr32_t, size_t, void *, size_t *);
+	int (*strategy)(void *, int, daddr_t, size_t, void *, size_t *);
 
 	dev_t bsddev, bootdev;
 
diff --git a/sys/arch/i386/stand/libsa/diskprobe.c b/sys/arch/i386/stand/libsa/diskprobe.c
index ea38de771f6..28c5a55d7c8 100644
--- a/sys/arch/i386/stand/libsa/diskprobe.c
+++ b/sys/arch/i386/stand/libsa/diskprobe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: diskprobe.c,v 1.46 2018/06/18 15:37:48 krw Exp $	*/
+/*	$OpenBSD: diskprobe.c,v 1.47 2020/12/09 18:10:18 krw Exp $	*/
 
 /*
  * Copyright (c) 1997 Tobias Weingartner
@@ -483,7 +483,7 @@ check_hibernate(struct diskinfo *dip)
 	    DL_GETPSIZE(&dip->disklabel.d_partitions[1]) -
             (sizeof(union hibernate_info) / DEV_BSIZE);
 
-	error = dip->strategy(dip, F_READ, (daddr32_t)sec, sizeof hib, &hib, NULL);
+	error = dip->strategy(dip, F_READ, sec, sizeof hib, &hib, NULL);
 	if (error == 0 && hib.magic == HIBERNATE_MAGIC)
 		dip->bios_info.flags |= BDI_HIBVALID; /* Hibernate present */
 }
diff --git a/sys/arch/i386/stand/libsa/pxe_net.c b/sys/arch/i386/stand/libsa/pxe_net.c
index 6473ec6ca6e..3eecf513d9b 100644
--- a/sys/arch/i386/stand/libsa/pxe_net.c
+++ b/sys/arch/i386/stand/libsa/pxe_net.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pxe_net.c,v 1.6 2017/05/08 20:13:10 patrick Exp $	*/
+/*	$OpenBSD: pxe_net.c,v 1.7 2020/12/09 18:10:18 krw Exp $	*/
 /*	$NetBSD: dev_net.c,v 1.4 2003/03/12 13:15:08 drochner Exp $	*/
 
 /*-
@@ -143,7 +143,7 @@ net_ioctl(struct open_file *f, u_long cmd, void *data)
 }
 
 int
-net_strategy(void *devdata, int rw, daddr32_t blk, size_t size, void *buf,
+net_strategy(void *devdata, int rw, daddr_t blk, size_t size, void *buf,
     size_t *rsize)
 {
 	return EIO;
diff --git a/sys/arch/i386/stand/libsa/pxe_net.h b/sys/arch/i386/stand/libsa/pxe_net.h
index e70e4503947..c412cb94b64 100644
--- a/sys/arch/i386/stand/libsa/pxe_net.h
+++ b/sys/arch/i386/stand/libsa/pxe_net.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pxe_net.h,v 1.3 2011/03/13 00:13:53 deraadt Exp $	*/
+/*	$OpenBSD: pxe_net.h,v 1.4 2020/12/09 18:10:18 krw Exp $	*/
 /*	$NetBSD$	*/
 
 /*-
@@ -34,4 +34,4 @@
 int	net_open(struct open_file *, ...);
 int	net_close(struct open_file *);
 int	net_ioctl(struct open_file *, u_long, void *);
-int	net_strategy(void *, int , daddr32_t , size_t, void *, size_t *);
+int	net_strategy(void *, int , daddr_t , size_t, void *, size_t *);
diff --git a/sys/arch/i386/stand/libsa/softraid_i386.c b/sys/arch/i386/stand/libsa/softraid_i386.c
index 0332b8e778b..ac86d21f7b3 100644
--- a/sys/arch/i386/stand/libsa/softraid_i386.c
+++ b/sys/arch/i386/stand/libsa/softraid_i386.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: softraid_i386.c,v 1.3 2017/12/18 12:53:33 fcambus Exp $	*/
+/*	$OpenBSD: softraid_i386.c,v 1.4 2020/12/09 18:10:18 krw Exp $	*/
 
 /*
  * Copyright (c) 2012 Joel Sing <jsing@openbsd.org>
@@ -304,7 +304,7 @@ srprobe(void)
 }
 
 int
-sr_strategy(struct sr_boot_volume *bv, int rw, daddr32_t blk, size_t size,
+sr_strategy(struct sr_boot_volume *bv, int rw, daddr_t blk, size_t size,
     void *buf, size_t *rsize)
 {
 	struct diskinfo *sr_dip, *dip;
diff --git a/sys/arch/i386/stand/libsa/softraid_i386.h b/sys/arch/i386/stand/libsa/softraid_i386.h
index 9294e687e8a..00c051b686d 100644
--- a/sys/arch/i386/stand/libsa/softraid_i386.h
+++ b/sys/arch/i386/stand/libsa/softraid_i386.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: softraid_i386.h,v 1.3 2016/09/11 17:52:47 jsing Exp $	*/
+/*	$OpenBSD: softraid_i386.h,v 1.4 2020/12/09 18:10:18 krw Exp $	*/
 
 /*
  * Copyright (c) 2012 Joel Sing <jsing@openbsd.org>
@@ -22,7 +22,7 @@
 void	srprobe(void);
 
 const char *sr_getdisklabel(struct sr_boot_volume *, struct disklabel *);
-int	sr_strategy(struct sr_boot_volume *, int, daddr32_t, size_t,
+int	sr_strategy(struct sr_boot_volume *, int, daddr_t, size_t,
 	    void *, size_t *);
 
 #endif /* _SOFTRAID_I386_H */
diff --git a/sys/arch/i386/stand/pxeboot/conf.c b/sys/arch/i386/stand/pxeboot/conf.c
index f8940a2e0dc..81f0b6673b2 100644
--- a/sys/arch/i386/stand/pxeboot/conf.c
+++ b/sys/arch/i386/stand/pxeboot/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.47 2020/06/14 16:06:25 deraadt Exp $	*/
+/*	$OpenBSD: conf.c,v 1.48 2020/12/09 18:10:18 krw Exp $	*/
 
 /*
  * Copyright (c) 2004 Tom Cosgrove
@@ -45,7 +45,7 @@
 #include "pxeboot.h"
 #include "pxe_net.h"
 
-const char version[] = "3.43";
+const char version[] = "3.44";
 int	debug = 1;
 
 void (*sa_cleanup)(void) = pxe_shutdown;
diff --git a/sys/arch/landisk/stand/boot/conf.c b/sys/arch/landisk/stand/boot/conf.c
index 187393c75a9..8a73fa79db7 100644
--- a/sys/arch/landisk/stand/boot/conf.c
+++ b/sys/arch/landisk/stand/boot/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.16 2020/05/26 14:00:42 deraadt Exp $	*/
+/*	$OpenBSD: conf.c,v 1.17 2020/12/09 18:10:19 krw Exp $	*/
 
 /*
  * Copyright (c) 2006 Michael Shalayeff
@@ -29,7 +29,7 @@
 #endif
 #include <dev/cons.h>
 
-const char version[] = "1.09";
+const char version[] = "1.10";
 int	debug = 1;
 
 struct fs_ops file_system[] = {
diff --git a/sys/arch/landisk/stand/boot/devs.c b/sys/arch/landisk/stand/boot/devs.c
index ec91d1731b5..4af103a56bb 100644
--- a/sys/arch/landisk/stand/boot/devs.c
+++ b/sys/arch/landisk/stand/boot/devs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: devs.c,v 1.11 2019/04/10 04:17:35 deraadt Exp $	*/
+/*	$OpenBSD: devs.c,v 1.12 2020/12/09 18:10:19 krw Exp $	*/
 
 /*
  * Copyright (c) 2006 Michael Shalayeff
@@ -89,7 +89,7 @@ blkdevopen(struct open_file *f, ...)
 }
 
 int
-blkdevstrategy(void *v, int flag, daddr32_t dblk, size_t size, void *buf, size_t *rsize)
+blkdevstrategy(void *v, int flag, daddr_t dblk, size_t size, void *buf, size_t *rsize)
 {
 
 	if (flag != F_READ)
diff --git a/sys/arch/landisk/stand/boot/libsa.h b/sys/arch/landisk/stand/boot/libsa.h
index 28efc1c8be7..f1b0787df57 100644
--- a/sys/arch/landisk/stand/boot/libsa.h
+++ b/sys/arch/landisk/stand/boot/libsa.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: libsa.h,v 1.7 2014/07/17 13:14:06 miod Exp $	*/
+/*	$OpenBSD: libsa.h,v 1.8 2020/12/09 18:10:19 krw Exp $	*/
 
 /*
  * Copyright (c) 2006 Michael Shalayeff
@@ -28,7 +28,7 @@
 int readsects(int dev, uint32_t lba, void *buf, size_t size);
 int blkdevopen(struct open_file *, ...);
 int blkdevclose(struct open_file *);
-int blkdevstrategy(void *, int, daddr32_t, size_t, void *, size_t *);
+int blkdevstrategy(void *, int, daddr_t, size_t, void *, size_t *);
 int  getc(void);
 void putc(int);
 void cache_flush(void);
diff --git a/sys/arch/landisk/stand/xxboot/boot1.c b/sys/arch/landisk/stand/xxboot/boot1.c
index 5fd3dbf6374..29c1dcde6b8 100644
--- a/sys/arch/landisk/stand/xxboot/boot1.c
+++ b/sys/arch/landisk/stand/xxboot/boot1.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: boot1.c,v 1.8 2019/08/03 15:22:21 deraadt Exp $	*/
+/*	$OpenBSD: boot1.c,v 1.9 2020/12/09 18:10:19 krw Exp $	*/
 /*	$NetBSD: boot1.c,v 1.1 2006/09/01 21:26:19 uwe Exp $	*/
 
 /*-
@@ -44,7 +44,7 @@ static uint32_t bios_sector;
 const char *boot1(uint32_t *);
 void putstr(const char *str);
 int raise(int sig);
-int blkdevstrategy(void *, int, daddr32_t, size_t, void *, size_t *);
+int blkdevstrategy(void *, int, daddr_t, size_t, void *, size_t *);
 int blkdevopen(struct open_file *, ...);
 int blkdevclose(struct open_file *);
 
@@ -118,7 +118,7 @@ blkdevclose(struct open_file *f)
 }
 
 int
-blkdevstrategy(void *devdata, int flag, daddr32_t dblk, size_t size, void *buf, size_t *rsize)
+blkdevstrategy(void *devdata, int flag, daddr_t dblk, size_t size, void *buf, size_t *rsize)
 {
 
 	if (flag != F_READ)
diff --git a/sys/arch/loongson/stand/boot/conf.c b/sys/arch/loongson/stand/boot/conf.c
index b231f521581..7a3b39a27ea 100644
--- a/sys/arch/loongson/stand/boot/conf.c
+++ b/sys/arch/loongson/stand/boot/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.15 2020/05/26 14:00:42 deraadt Exp $	*/
+/*	$OpenBSD: conf.c,v 1.16 2020/12/09 18:10:19 krw Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1990, 1993
@@ -40,7 +40,7 @@
 #include <lib/libsa/ufs2.h>
 #include <lib/libsa/cd9660.h>
 
-const char version[] = "1.2";
+const char version[] = "1.3";
 #if 0	/* network code not compiled in */
 int	debug = 0;
 #endif
diff --git a/sys/arch/loongson/stand/boot/dev.c b/sys/arch/loongson/stand/boot/dev.c
index ce4e4804358..5ae45e8a10c 100644
--- a/sys/arch/loongson/stand/boot/dev.c
+++ b/sys/arch/loongson/stand/boot/dev.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dev.c,v 1.10 2020/05/27 14:45:56 visa Exp $	*/
+/*	$OpenBSD: dev.c,v 1.11 2020/12/09 18:10:19 krw Exp $	*/
 
 /*
  * Copyright (c) 2010 Miodrag Vallat.
@@ -66,7 +66,7 @@ struct pmon_iodata {
 int	pmon_getdisklabel(struct pmon_iodata *pi);
 
 int
-pmon_iostrategy(void *f, int rw, daddr32_t dblk, size_t size, void *buf,
+pmon_iostrategy(void *f, int rw, daddr_t dblk, size_t size, void *buf,
     size_t *rsize)
 {
 	struct pmon_iodata *pi = (struct pmon_iodata *)f;
diff --git a/sys/arch/loongson/stand/boot/libsa.h b/sys/arch/loongson/stand/boot/libsa.h
index 2dea425026d..d375daffc54 100644
--- a/sys/arch/loongson/stand/boot/libsa.h
+++ b/sys/arch/loongson/stand/boot/libsa.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: libsa.h,v 1.6 2019/04/10 04:17:35 deraadt Exp $	*/
+/*	$OpenBSD: libsa.h,v 1.7 2020/12/09 18:10:19 krw Exp $	*/
 
 /*
  * Copyright (c) 2010 Miodrag Vallat.
@@ -41,14 +41,14 @@ void	pmon_cnputc(dev_t, int);
 /*
  * PMON I/O
  */
-int	pmon_iostrategy(void *, int, daddr32_t, size_t, void *, size_t *);
+int	pmon_iostrategy(void *, int, daddr_t, size_t, void *, size_t *);
 int	pmon_ioopen(struct open_file *, ...);
 int	pmon_ioclose(struct open_file *);
 
 /*
  * INITRD I/O
  */
-int	rd_iostrategy(void *, int, daddr32_t, size_t, void *, size_t *);
+int	rd_iostrategy(void *, int, daddr_t, size_t, void *, size_t *);
 int	rd_ioopen(struct open_file *, ...);
 int	rd_ioclose(struct open_file *);
 int	rd_isvalid(void);
diff --git a/sys/arch/loongson/stand/boot/rd.c b/sys/arch/loongson/stand/boot/rd.c
index c5cd107aa42..e82e5337c26 100644
--- a/sys/arch/loongson/stand/boot/rd.c
+++ b/sys/arch/loongson/stand/boot/rd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rd.c,v 1.4 2013/03/24 19:20:35 deraadt Exp $	*/
+/*	$OpenBSD: rd.c,v 1.5 2020/12/09 18:10:19 krw Exp $	*/
 
 /*
  * Copyright (c) 2010 Miodrag Vallat.
@@ -28,7 +28,7 @@ static	off_t rdoffs;
  */
 
 int
-rd_iostrategy(void *f, int rw, daddr32_t dblk, size_t size, void *buf,
+rd_iostrategy(void *f, int rw, daddr_t dblk, size_t size, void *buf,
     size_t *rsize)
 {
 	/* never invoked directly */
diff --git a/sys/arch/luna88k/stand/boot/conf.c b/sys/arch/luna88k/stand/boot/conf.c
index 1991bcb0592..70c4646c41f 100644
--- a/sys/arch/luna88k/stand/boot/conf.c
+++ b/sys/arch/luna88k/stand/boot/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.3 2014/08/21 14:24:08 mpi Exp $	*/
+/*	$OpenBSD: conf.c,v 1.4 2020/12/09 18:10:19 krw Exp $	*/
 /*	$NetBSD: conf.c,v 1.3 2013/01/16 15:46:20 tsutsui Exp $	*/
 
 /*
@@ -46,7 +46,7 @@
 #include "dev_net.h"
 
 #define xxstrategy	\
-	(int (*)(void *, int, daddr32_t, size_t, void *, size_t *))nullsys
+	(int (*)(void *, int, daddr_t, size_t, void *, size_t *))nullsys
 #define xxopen		(int (*)(struct open_file *, ...))nodev
 #define xxclose		(int (*)(struct open_file *))nullsys
 
diff --git a/sys/arch/luna88k/stand/boot/dev_net.c b/sys/arch/luna88k/stand/boot/dev_net.c
index da29cccb002..445445bee3b 100644
--- a/sys/arch/luna88k/stand/boot/dev_net.c
+++ b/sys/arch/luna88k/stand/boot/dev_net.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dev_net.c,v 1.3 2014/07/13 15:31:20 mpi Exp $	*/
+/*	$OpenBSD: dev_net.c,v 1.4 2020/12/09 18:10:19 krw Exp $	*/
 /*	$NetBSD: dev_net.c,v 1.26 2011/07/17 20:54:52 joerg Exp $	*/
 
 /*-
@@ -176,7 +176,7 @@ net_ioctl(struct open_file *f, u_long cmd, void *data)
 }
 
 int
-net_strategy(void *devdata, int rw, daddr32_t blk, size_t size, void *buf,
+net_strategy(void *devdata, int rw, daddr_t blk, size_t size, void *buf,
 	size_t *rsize)
 {
 
diff --git a/sys/arch/luna88k/stand/boot/dev_net.h b/sys/arch/luna88k/stand/boot/dev_net.h
index e3536c708cc..c4de3cce4a1 100644
--- a/sys/arch/luna88k/stand/boot/dev_net.h
+++ b/sys/arch/luna88k/stand/boot/dev_net.h
@@ -3,7 +3,7 @@
 int	net_open(struct open_file *, ...);
 int	net_close(struct open_file *);
 int	net_ioctl(struct open_file *, u_long, void *);
-int	net_strategy(void *, int , daddr32_t , size_t, void *, size_t *);
+int	net_strategy(void *, int , daddr_t , size_t, void *, size_t *);
 
 #ifdef SUPPORT_BOOTP
 extern int try_bootp;
diff --git a/sys/arch/luna88k/stand/boot/samachdep.h b/sys/arch/luna88k/stand/boot/samachdep.h
index 31e75490429..26a4784ed5b 100644
--- a/sys/arch/luna88k/stand/boot/samachdep.h
+++ b/sys/arch/luna88k/stand/boot/samachdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: samachdep.h,v 1.3 2013/10/29 21:49:07 miod Exp $	*/
+/*	$OpenBSD: samachdep.h,v 1.4 2020/12/09 18:10:19 krw Exp $	*/
 /*	$NetBSD: samachdep.h,v 1.10 2013/03/05 15:34:53 tsutsui Exp $	*/
 
 /*
@@ -133,7 +133,7 @@ int scsi_request_sense(struct scsi_softc *, int, int, u_char *, unsigned int);
 int scsi_test_unit_rdy(struct scsi_softc *, int, int);
 
 /* sd.c */
-int sdstrategy(void *, int, daddr32_t, size_t, void *, size_t *);
+int sdstrategy(void *, int, daddr_t, size_t, void *, size_t *);
 int sdopen(struct open_file *, ...);
 int sdclose(struct open_file *);
 
diff --git a/sys/arch/luna88k/stand/boot/sd.c b/sys/arch/luna88k/stand/boot/sd.c
index 890fc7706da..ef539a9d674 100644
--- a/sys/arch/luna88k/stand/boot/sd.c
+++ b/sys/arch/luna88k/stand/boot/sd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sd.c,v 1.5 2014/07/12 21:03:38 tedu Exp $	*/
+/*	$OpenBSD: sd.c,v 1.6 2020/12/09 18:10:19 krw Exp $	*/
 /*	$NetBSD: sd.c,v 1.5 2013/01/22 15:48:40 tsutsui Exp $	*/
 
 /*
@@ -298,7 +298,7 @@ static struct scsi_generic_cdb cdb_write = {
 };
 
 int
-sdstrategy(void *devdata, int func, daddr32_t dblk, size_t size, void *v_buf,
+sdstrategy(void *devdata, int func, daddr_t dblk, size_t size, void *v_buf,
     size_t *rsize)
 {
 	struct sd_softc *sc = devdata;
diff --git a/sys/arch/macppc/stand/conf.c b/sys/arch/macppc/stand/conf.c
index 8a2983315c6..c08f694a081 100644
--- a/sys/arch/macppc/stand/conf.c
+++ b/sys/arch/macppc/stand/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.12 2020/10/03 06:22:20 gkoehler Exp $	*/
+/*	$OpenBSD: conf.c,v 1.13 2020/12/09 18:10:19 krw Exp $	*/
 /*
  * Copyright (c) 2007 Dale Rahn <drahn@openbsd.org>
  *
@@ -21,7 +21,7 @@
 #include <lib/libsa/stand.h>
 
 
-const char version[] = "1.10";
+const char version[] = "1.11";
 int     debug = 0;
 
 void ofc_probe(struct consdev *);
diff --git a/sys/arch/macppc/stand/ofdev.c b/sys/arch/macppc/stand/ofdev.c
index 24bf329c8b0..11642cd4fc9 100644
--- a/sys/arch/macppc/stand/ofdev.c
+++ b/sys/arch/macppc/stand/ofdev.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ofdev.c,v 1.24 2020/03/16 07:02:10 otto Exp $	*/
+/*	$OpenBSD: ofdev.c,v 1.25 2020/12/09 18:10:19 krw Exp $	*/
 /*	$NetBSD: ofdev.c,v 1.1 1997/04/16 20:29:20 thorpej Exp $	*/
 
 /*
@@ -87,7 +87,7 @@ parsename(char *str, char **file)
 }
 
 static int
-strategy(void *devdata, int rw, daddr32_t blk, size_t size, void *buf,
+strategy(void *devdata, int rw, daddr_t blk, size_t size, void *buf,
     size_t *rsize)
 {
 	struct of_dev *dev = devdata;
diff --git a/sys/arch/octeon/stand/rdboot/rdboot.c b/sys/arch/octeon/stand/rdboot/rdboot.c
index dc76c20b4ba..850279c42a4 100644
--- a/sys/arch/octeon/stand/rdboot/rdboot.c
+++ b/sys/arch/octeon/stand/rdboot/rdboot.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rdboot.c,v 1.7 2020/05/26 14:00:42 deraadt Exp $	*/
+/*	$OpenBSD: rdboot.c,v 1.8 2020/12/09 18:10:19 krw Exp $	*/
 
 /*
  * Copyright (c) 2019-2020 Visa Hankala
@@ -51,7 +51,7 @@ void	kexec(void);
 
 struct cmd_state cmd;
 int octbootfd = -1;
-const char version[] = "1.2";
+const char version[] = "1.3";
 
 int
 main(void)
diff --git a/sys/arch/powerpc64/stand/rdboot/rdboot.c b/sys/arch/powerpc64/stand/rdboot/rdboot.c
index 2e942b94efe..5dc0d58c9c0 100644
--- a/sys/arch/powerpc64/stand/rdboot/rdboot.c
+++ b/sys/arch/powerpc64/stand/rdboot/rdboot.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rdboot.c,v 1.2 2020/07/18 10:23:44 kettenis Exp $	*/
+/*	$OpenBSD: rdboot.c,v 1.3 2020/12/09 18:10:19 krw Exp $	*/
 
 /*
  * Copyright (c) 2019-2020 Visa Hankala
@@ -51,7 +51,7 @@ void	kexec(void);
 
 struct cmd_state cmd;
 int kexecfd = -1;
-const char version[] = "0.1";
+const char version[] = "0.2";
 
 int
 main(void)
diff --git a/sys/arch/sgi/stand/boot/conf.c b/sys/arch/sgi/stand/boot/conf.c
index 4b2a66a1ed5..98699afd778 100644
--- a/sys/arch/sgi/stand/boot/conf.c
+++ b/sys/arch/sgi/stand/boot/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.8 2020/05/26 14:00:42 deraadt Exp $ */
+/*	$OpenBSD: conf.c,v 1.9 2020/12/09 18:10:19 krw Exp $ */
 
 /*
  * Copyright (c) 1997 Per Fogelstrom
@@ -27,18 +27,18 @@
  */
 #include <stand.h>
 
-const char version[] = "1.12";
+const char version[] = "1.13";
 
 extern void	nullsys();
 extern int	nodev();
 extern int	noioctl();
 
-int	diostrategy(void *, int, daddr32_t, size_t, void *, size_t *);
+int	diostrategy(void *, int, daddr_t, size_t, void *, size_t *);
 int	dioopen(struct open_file *, ...);
 int	dioclose(struct open_file *);
 #define	dioioctl	noioctl
 
-int	netstrategy(void *, int, daddr32_t, size_t, void *, size_t *);
+int	netstrategy(void *, int, daddr_t, size_t, void *, size_t *);
 int	netopen(struct open_file *, ...);
 int	netclose(struct open_file *);
 #define	netioctl	noioctl
diff --git a/sys/arch/sgi/stand/boot/diskio.c b/sys/arch/sgi/stand/boot/diskio.c
index 78b59953f7b..48104ca11ac 100644
--- a/sys/arch/sgi/stand/boot/diskio.c
+++ b/sys/arch/sgi/stand/boot/diskio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: diskio.c,v 1.13 2020/06/06 10:54:41 visa Exp $ */
+/*	$OpenBSD: diskio.c,v 1.14 2020/12/09 18:10:19 krw Exp $ */
 
 /*
  * Copyright (c) 2016 Miodrag Vallat.
@@ -64,7 +64,7 @@ struct	dio_softc {
 };
 
 int
-diostrategy(void *devdata, int rw, daddr32_t bn, size_t reqcnt, void *addr,
+diostrategy(void *devdata, int rw, daddr_t bn, size_t reqcnt, void *addr,
     size_t *cnt)
 {
 	struct dio_softc *sc = (struct dio_softc *)devdata;
diff --git a/sys/arch/sgi/stand/boot/netfs.c b/sys/arch/sgi/stand/boot/netfs.c
index f27a4ff87c8..76bed9a4a6d 100644
--- a/sys/arch/sgi/stand/boot/netfs.c
+++ b/sys/arch/sgi/stand/boot/netfs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: netfs.c,v 1.2 2016/03/14 23:08:05 krw Exp $	*/
+/*	$OpenBSD: netfs.c,v 1.3 2020/12/09 18:10:19 krw Exp $	*/
 
 /*-
  * Copyright (c) 2001 Steve Murphree, Jr.
@@ -160,7 +160,7 @@ netfs_open(path, f)
 {
 	struct tftp_file *fp;
 	int rc = 0;
-extern int netstrategy(void *, int, daddr32_t, size_t, void *, size_t *);
+extern int netstrategy(void *, int, daddr_t, size_t, void *, size_t *);
 	
 	if (f->f_dev->dv_strategy != netstrategy)
 		return EINVAL;
diff --git a/sys/arch/sgi/stand/boot/netio.c b/sys/arch/sgi/stand/boot/netio.c
index d62181814ef..2595e56566c 100644
--- a/sys/arch/sgi/stand/boot/netio.c
+++ b/sys/arch/sgi/stand/boot/netio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: netio.c,v 1.2 2020/06/06 10:54:41 visa Exp $	*/
+/*	$OpenBSD: netio.c,v 1.3 2020/12/09 18:10:19 krw Exp $	*/
 
 /*
  * Copyright (c) 2012 Miodrag Vallat.
@@ -24,7 +24,7 @@
 #include <mips64/arcbios.h>
 
 int
-netstrategy(void *devdata, int rw, daddr32_t bn, size_t reqcnt, void *addr,
+netstrategy(void *devdata, int rw, daddr_t bn, size_t reqcnt, void *addr,
     size_t *cnt)
 {
 	long fd = (long)devdata;
diff --git a/sys/arch/sparc64/stand/ofwboot/ofdev.c b/sys/arch/sparc64/stand/ofwboot/ofdev.c
index 0aa8fa52332..c23b4129c66 100644
--- a/sys/arch/sparc64/stand/ofwboot/ofdev.c
+++ b/sys/arch/sparc64/stand/ofwboot/ofdev.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ofdev.c,v 1.30 2020/05/26 16:28:49 kettenis Exp $	*/
+/*	$OpenBSD: ofdev.c,v 1.31 2020/12/09 18:10:19 krw Exp $	*/
 /*	$NetBSD: ofdev.c,v 1.1 2000/08/20 14:58:41 mrg Exp $	*/
 
 /*
@@ -120,7 +120,7 @@ filename(char *str, char *ppart)
 }
 
 int
-strategy(void *devdata, int rw, daddr32_t blk, size_t size, void *buf,
+strategy(void *devdata, int rw, daddr_t blk, size_t size, void *buf,
     size_t *rsize)
 {
 	struct of_dev *dev = devdata;
diff --git a/sys/arch/sparc64/stand/ofwboot/ofdev.h b/sys/arch/sparc64/stand/ofwboot/ofdev.h
index a2b198370b7..57c6af6fa62 100644
--- a/sys/arch/sparc64/stand/ofwboot/ofdev.h
+++ b/sys/arch/sparc64/stand/ofwboot/ofdev.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ofdev.h,v 1.6 2018/12/31 11:44:57 claudio Exp $	*/
+/*	$OpenBSD: ofdev.h,v 1.7 2020/12/09 18:10:19 krw Exp $	*/
 /*	$NetBSD: ofdev.h,v 1.1 2000/08/20 14:58:41 mrg Exp $	*/
 
 /*
@@ -64,7 +64,7 @@ extern char opened_name[];
 extern int floppyboot;
 
 int load_disklabel(struct of_dev *, struct disklabel *);
-int strategy(void *, int, daddr32_t, size_t, void *, size_t *);
+int strategy(void *, int, daddr_t, size_t, void *, size_t *);
 
 int net_open(struct of_dev *);
 void net_close(struct of_dev *);
diff --git a/sys/arch/sparc64/stand/ofwboot/softraid_sparc64.c b/sys/arch/sparc64/stand/ofwboot/softraid_sparc64.c
index c7fc477432d..3c279d5df92 100644
--- a/sys/arch/sparc64/stand/ofwboot/softraid_sparc64.c
+++ b/sys/arch/sparc64/stand/ofwboot/softraid_sparc64.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: softraid_sparc64.c,v 1.4 2018/12/31 11:44:57 claudio Exp $	*/
+/*	$OpenBSD: softraid_sparc64.c,v 1.5 2020/12/09 18:10:19 krw Exp $	*/
 
 /*
  * Copyright (c) 2012 Joel Sing <jsing@openbsd.org>
@@ -324,7 +324,7 @@ sr_vol_boot_chunk(struct sr_boot_volume *bv)
 
 
 int
-sr_strategy(struct sr_boot_volume *bv, int sr_handle, int rw, daddr32_t blk,
+sr_strategy(struct sr_boot_volume *bv, int sr_handle, int rw, daddr_t blk,
     size_t size, void *buf, size_t *rsize)
 {
 	struct diskinfo *sr_dip, *dip;
diff --git a/sys/arch/sparc64/stand/ofwboot/softraid_sparc64.h b/sys/arch/sparc64/stand/ofwboot/softraid_sparc64.h
index ce297d66614..a1799530fd0 100644
--- a/sys/arch/sparc64/stand/ofwboot/softraid_sparc64.h
+++ b/sys/arch/sparc64/stand/ofwboot/softraid_sparc64.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: softraid_sparc64.h,v 1.4 2018/03/29 08:12:58 stsp Exp $	*/
+/*	$OpenBSD: softraid_sparc64.h,v 1.5 2020/12/09 18:10:19 krw Exp $	*/
 
 /*
  * Copyright (c) 2012 Joel Sing <jsing@openbsd.org>
@@ -23,7 +23,7 @@ void	srprobe(void);
 
 struct sr_boot_chunk *sr_vol_boot_chunk(struct sr_boot_volume *);
 const char *sr_getdisklabel(struct sr_boot_volume *, struct disklabel *);
-int	sr_strategy(struct sr_boot_volume *, int, int, daddr32_t, size_t,
+int	sr_strategy(struct sr_boot_volume *, int, int, daddr_t, size_t,
 	    void *, size_t *);
 
 #endif /* _SOFTRAID_SPARC64_H */
diff --git a/sys/arch/sparc64/stand/ofwboot/vers.c b/sys/arch/sparc64/stand/ofwboot/vers.c
index 2a743eee20b..3ca4ec8093b 100644
--- a/sys/arch/sparc64/stand/ofwboot/vers.c
+++ b/sys/arch/sparc64/stand/ofwboot/vers.c
@@ -1 +1 @@
-const char version[] = "1.20";
+const char version[] = "1.21";
diff --git a/sys/lib/libsa/stand.h b/sys/lib/libsa/stand.h
index dda2b89a622..8419a0ae5af 100644
--- a/sys/lib/libsa/stand.h
+++ b/sys/lib/libsa/stand.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: stand.h,v 1.69 2019/11/28 00:17:13 bluhm Exp $	*/
+/*	$OpenBSD: stand.h,v 1.70 2020/12/09 18:10:19 krw Exp $	*/
 /*	$NetBSD: stand.h,v 1.18 1996/11/30 04:35:51 gwr Exp $	*/
 
 /*-
@@ -82,7 +82,7 @@ extern int nfsys;
 struct devsw {
 	char	*dv_name;
 	int	(*dv_strategy)(void *devdata, int rw,
-				    daddr32_t blk, size_t size,
+				    daddr_t blk, size_t size,
 				    void *buf, size_t *rsize);
 	int	(*dv_open)(struct open_file *f, ...);
 	int	(*dv_close)(struct open_file *f);