Module Name: src
Committed By: thorpej
Date: Sun Mar 1 16:31:01 UTC 2020
Modified Files:
src/sys/dev/pci: if_nfe.c if_stge.c
Log Message:
Add explicit casts in bus_dmatag_subregion() calls to avoid overflow /
truncation warnings on 32-bit platforms.
To generate a diff of this commit:
cvs rdiff -u -r1.75 -r1.76 src/sys/dev/pci/if_nfe.c
cvs rdiff -u -r1.81 -r1.82 src/sys/dev/pci/if_stge.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_nfe.c
diff -u src/sys/dev/pci/if_nfe.c:1.75 src/sys/dev/pci/if_nfe.c:1.76
--- src/sys/dev/pci/if_nfe.c:1.75 Sun Mar 1 15:43:58 2020
+++ src/sys/dev/pci/if_nfe.c Sun Mar 1 16:31:01 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_nfe.c,v 1.75 2020/03/01 15:43:58 thorpej Exp $ */
+/* $NetBSD: if_nfe.c,v 1.76 2020/03/01 16:31:01 thorpej Exp $ */
/* $OpenBSD: if_nfe.c,v 1.77 2008/02/05 16:52:50 brad Exp $ */
/*-
@@ -21,7 +21,7 @@
/* Driver for NVIDIA nForce MCP Fast Ethernet and Gigabit Ethernet */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_nfe.c,v 1.75 2020/03/01 15:43:58 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_nfe.c,v 1.76 2020/03/01 16:31:01 thorpej Exp $");
#include "opt_inet.h"
#include "vlan.h"
@@ -324,7 +324,7 @@ nfe_attach(device_t parent, device_t sel
if (pci_dma64_available(pa) && (sc->sc_flags & NFE_40BIT_ADDR) != 0) {
if (bus_dmatag_subregion(pa->pa_dmat64,
0,
- (1ULL << 40),
+ (bus_addr_t)(1ULL << 40),
&sc->sc_dmat,
BUS_DMA_WAITOK) != 0) {
aprint_error_dev(self,
Index: src/sys/dev/pci/if_stge.c
diff -u src/sys/dev/pci/if_stge.c:1.81 src/sys/dev/pci/if_stge.c:1.82
--- src/sys/dev/pci/if_stge.c:1.81 Sun Mar 1 15:46:32 2020
+++ src/sys/dev/pci/if_stge.c Sun Mar 1 16:31:01 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_stge.c,v 1.81 2020/03/01 15:46:32 thorpej Exp $ */
+/* $NetBSD: if_stge.c,v 1.82 2020/03/01 16:31:01 thorpej Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_stge.c,v 1.81 2020/03/01 15:46:32 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_stge.c,v 1.82 2020/03/01 16:31:01 thorpej Exp $");
#include <sys/param.h>
@@ -450,7 +450,7 @@ stge_attach(device_t parent, device_t se
if (pci_dma64_available(pa)) {
if (bus_dmatag_subregion(pa->pa_dmat64,
0,
- FRAG_ADDR_MASK + 1ULL,
+ (bus_addr_t)(FRAG_ADDR_MASK + 1ULL),
&sc->sc_dmat,
BUS_DMA_WAITOK) != 0) {
aprint_error_dev(self,
