Module Name: src
Committed By: jym
Date: Mon Jul 26 22:33:25 UTC 2010
Modified Files:
src/sys/arch/i386/conf: ALL
src/sys/arch/i386/pci: pcibios.c piixpcib.c
src/sys/arch/i386/pnpbios: pnpbios.c
src/sys/arch/x86/pci: pci_addr_fixup.c
src/sys/compat/ndis: subr_ndis.c
src/sys/dev/ic: ciss.c
src/sys/dev/isa: isadma.c
src/sys/dev/pci: cz.c if_sk.c if_wm.c yds.c
Log Message:
Add PAE to ALL kernel, so that most paddr_t format string errors get caught
during compilation.
While here, fix the compilation for ALL.
To generate a diff of this commit:
cvs rdiff -u -r1.261 -r1.262 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/i386/pci/pcibios.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/i386/pci/piixpcib.c
cvs rdiff -u -r1.69 -r1.70 src/sys/arch/i386/pnpbios/pnpbios.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/x86/pci/pci_addr_fixup.c
cvs rdiff -u -r1.22 -r1.23 src/sys/compat/ndis/subr_ndis.c
cvs rdiff -u -r1.20 -r1.21 src/sys/dev/ic/ciss.c
cvs rdiff -u -r1.64 -r1.65 src/sys/dev/isa/isadma.c
cvs rdiff -u -r1.53 -r1.54 src/sys/dev/pci/cz.c
cvs rdiff -u -r1.67 -r1.68 src/sys/dev/pci/if_sk.c
cvs rdiff -u -r1.213 -r1.214 src/sys/dev/pci/if_wm.c
cvs rdiff -u -r1.49 -r1.50 src/sys/dev/pci/yds.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/arch/i386/conf/ALL
diff -u src/sys/arch/i386/conf/ALL:1.261 src/sys/arch/i386/conf/ALL:1.262
--- src/sys/arch/i386/conf/ALL:1.261 Sun Jul 18 10:19:09 2010
+++ src/sys/arch/i386/conf/ALL Mon Jul 26 22:33:23 2010
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.261 2010/07/18 10:19:09 jruoho Exp $
+# $NetBSD: ALL,v 1.262 2010/07/26 22:33:23 jym Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
@@ -17,7 +17,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ALL-$Revision: 1.261 $"
+#ident "ALL-$Revision: 1.262 $"
maxusers 64 # estimated number of users
@@ -27,6 +27,7 @@
options VM86 # virtual 8086 emulation
options USER_LDT # user-settable LDT; used by WINE
options X86EMU # 386 Real Mode emulator
+options PAE # PAE mode (36 bits physical addressing)
# Enhanced SpeedStep Technology in the Pentium M
options ENHANCED_SPEEDSTEP
Index: src/sys/arch/i386/pci/pcibios.c
diff -u src/sys/arch/i386/pci/pcibios.c:1.38 src/sys/arch/i386/pci/pcibios.c:1.39
--- src/sys/arch/i386/pci/pcibios.c:1.38 Wed Apr 28 19:17:04 2010
+++ src/sys/arch/i386/pci/pcibios.c Mon Jul 26 22:33:23 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pcibios.c,v 1.38 2010/04/28 19:17:04 dyoung Exp $ */
+/* $NetBSD: pcibios.c,v 1.39 2010/07/26 22:33:23 jym Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcibios.c,v 1.38 2010/04/28 19:17:04 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcibios.c,v 1.39 2010/07/26 22:33:23 jym Exp $");
#include "opt_pcibios.h"
#include "opt_pcifixup.h"
@@ -166,7 +166,7 @@
return;
}
- aprint_normal("PCI BIOS rev. %d.%d found at 0x%lx\n",
+ aprint_normal("PCI BIOS rev. %d.%d found at %#" PRIxPADDR "\n",
rev_maj, rev_min >> 4, ei.bei_entry);
aprint_verbose("pcibios: config mechanism %s%s, special cycles %s%s, "
"last bus %d\n",
@@ -250,8 +250,8 @@
cksum += *(unsigned char *)(p + i);
aprint_normal(
- "PCI IRQ Routing Table rev. %d.%d found at 0x%lx, "
- "size %d bytes (%d entries)\n", rev_maj, rev_min, pa,
+ "PCI IRQ Routing Table rev. %d.%d found at %#" PRIxPADDR
+ ", size %d bytes (%d entries)\n", rev_maj, rev_min, pa,
tablesize, (tablesize - 32) / 16);
if (cksum != 0) {
Index: src/sys/arch/i386/pci/piixpcib.c
diff -u src/sys/arch/i386/pci/piixpcib.c:1.18 src/sys/arch/i386/pci/piixpcib.c:1.19
--- src/sys/arch/i386/pci/piixpcib.c:1.18 Wed Feb 24 22:37:55 2010
+++ src/sys/arch/i386/pci/piixpcib.c Mon Jul 26 22:33:23 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: piixpcib.c,v 1.18 2010/02/24 22:37:55 dyoung Exp $ */
+/* $NetBSD: piixpcib.c,v 1.19 2010/07/26 22:33:23 jym Exp $ */
/*-
* Copyright (c) 2004, 2006 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: piixpcib.c,v 1.18 2010/02/24 22:37:55 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: piixpcib.c,v 1.19 2010/07/26 22:33:23 jym Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -214,7 +214,7 @@
piixpcib_set_ownership(struct piixpcib_softc *sc)
{
int rv;
- paddr_t pmagic;
+ u_long pmagic;
static char magic[] = "Copyright (c) 1999 Intel Corporation";
pmagic = vtophys((vaddr_t)magic);
Index: src/sys/arch/i386/pnpbios/pnpbios.c
diff -u src/sys/arch/i386/pnpbios/pnpbios.c:1.69 src/sys/arch/i386/pnpbios/pnpbios.c:1.70
--- src/sys/arch/i386/pnpbios/pnpbios.c:1.69 Wed Apr 28 19:17:04 2010
+++ src/sys/arch/i386/pnpbios/pnpbios.c Mon Jul 26 22:33:23 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pnpbios.c,v 1.69 2010/04/28 19:17:04 dyoung Exp $ */
+/* $NetBSD: pnpbios.c,v 1.70 2010/07/26 22:33:23 jym Exp $ */
/*
* Copyright (c) 2000 Jason R. Thorpe. All rights reserved.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pnpbios.c,v 1.69 2010/04/28 19:17:04 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pnpbios.c,v 1.70 2010/07/26 22:33:23 jym Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -269,7 +269,7 @@
pmap_kenter_pa(va, pa, prot, 0);
pmap_update(pmap_kernel());
- return ((void *)(startva + (addr - startpa)));
+ return ((void *)(startva + (vaddr_t)(addr - startpa)));
}
static void
Index: src/sys/arch/x86/pci/pci_addr_fixup.c
diff -u src/sys/arch/x86/pci/pci_addr_fixup.c:1.4 src/sys/arch/x86/pci/pci_addr_fixup.c:1.5
--- src/sys/arch/x86/pci/pci_addr_fixup.c:1.4 Tue Feb 17 20:35:35 2009
+++ src/sys/arch/x86/pci/pci_addr_fixup.c Mon Jul 26 22:33:23 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_addr_fixup.c,v 1.4 2009/02/17 20:35:35 jmcneill Exp $ */
+/* $NetBSD: pci_addr_fixup.c,v 1.5 2010/07/26 22:33:23 jym Exp $ */
/*-
* Copyright (c) 2000 UCHIYAMA Yasushi. All rights reserved.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_addr_fixup.c,v 1.4 2009/02/17 20:35:35 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_addr_fixup.c,v 1.5 2010/07/26 22:33:23 jym Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -289,7 +289,8 @@
}
error = extent_alloc_subregion(ex, start, ex->ex_end, size,
size, 0,
- EX_FAST|EX_NOWAIT|EX_MALLOCOK, addr);
+ EX_FAST|EX_NOWAIT|EX_MALLOCOK,
+ (u_long *)addr);
if (error) {
aprint_debug("No available resources. fixup failed\n");
return (1);
Index: src/sys/compat/ndis/subr_ndis.c
diff -u src/sys/compat/ndis/subr_ndis.c:1.22 src/sys/compat/ndis/subr_ndis.c:1.23
--- src/sys/compat/ndis/subr_ndis.c:1.22 Mon Jun 29 05:08:16 2009
+++ src/sys/compat/ndis/subr_ndis.c Mon Jul 26 22:33:23 2010
@@ -35,7 +35,7 @@
__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ndis.c,v 1.67.2.7 2005/03/31 21:50:11 wpaul Exp $");
#endif
#ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: subr_ndis.c,v 1.22 2009/06/29 05:08:16 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_ndis.c,v 1.23 2010/07/26 22:33:23 jym Exp $");
#endif
/*
@@ -1552,10 +1552,10 @@
switch (sc->ndis_iftype){
case PCIBus:
case CBus: /* CardBus */
- *offset = (void*)sc->ndis_res_io->res_base;
+ *offset = (void*)(u_long)sc->ndis_res_io->res_base;
break;
case PCMCIABus:
- *offset = (void*)sc->ndis_res_pcioh.addr;
+ *offset = (void*)(u_long)sc->ndis_res_pcioh.addr;
break;
default:
return(NDIS_STATUS_FAILURE);
Index: src/sys/dev/ic/ciss.c
diff -u src/sys/dev/ic/ciss.c:1.20 src/sys/dev/ic/ciss.c:1.21
--- src/sys/dev/ic/ciss.c:1.20 Sun Mar 14 18:06:28 2010
+++ src/sys/dev/ic/ciss.c Mon Jul 26 22:33:24 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ciss.c,v 1.20 2010/03/14 18:06:28 pgoyette Exp $ */
+/* $NetBSD: ciss.c,v 1.21 2010/07/26 22:33:24 jym Exp $ */
/* $OpenBSD: ciss.c,v 1.14 2006/03/13 16:02:23 mickey Exp $ */
/*
@@ -19,7 +19,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ciss.c,v 1.20 2010/03/14 18:06:28 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ciss.c,v 1.21 2010/07/26 22:33:24 jym Exp $");
#include "bio.h"
@@ -469,9 +469,8 @@
cmd->sgin = dmap->dm_nsegs;
sgd = dmap->dm_segs;
- CISS_DPRINTF(CISS_D_DMA, ("data=%p/%u<0x%lx/%lu",
- ccb->ccb_data, ccb->ccb_len, sgd->ds_addr,
- (u_long)sgd->ds_len));
+ CISS_DPRINTF(CISS_D_DMA, ("data=%p/%u<%#" PRIxPADDR "/%zu",
+ ccb->ccb_data, ccb->ccb_len, sgd->ds_addr,sgd->ds_len));
for (i = 0; i < dmap->dm_nsegs; sgd++, i++) {
cmd->sgl[i].addr_lo = htole32(sgd->ds_addr);
@@ -481,8 +480,8 @@
cmd->sgl[i].flags = htole32(0);
if (i) {
CISS_DPRINTF(CISS_D_DMA,
- (",0x%lx/%lu", sgd->ds_addr,
- (u_long)sgd->ds_len));
+ (",%#" PRIxPADDR "/%zu", sgd->ds_addr,
+ sgd->ds_len));
}
}
Index: src/sys/dev/isa/isadma.c
diff -u src/sys/dev/isa/isadma.c:1.64 src/sys/dev/isa/isadma.c:1.65
--- src/sys/dev/isa/isadma.c:1.64 Mon Apr 19 18:24:26 2010
+++ src/sys/dev/isa/isadma.c Mon Jul 26 22:33:24 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: isadma.c,v 1.64 2010/04/19 18:24:26 dyoung Exp $ */
+/* $NetBSD: isadma.c,v 1.65 2010/07/26 22:33:24 jym Exp $ */
/*-
* Copyright (c) 1997, 1998, 2000 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isadma.c,v 1.64 2010/04/19 18:24:26 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isadma.c,v 1.65 2010/07/26 22:33:24 jym Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -414,7 +414,7 @@
dmaaddr = dmam->dm_segs[0].ds_addr;
#ifdef ISADMA_DEBUG
- printf(" dmaaddr 0x%lx\n", dmaaddr);
+ printf(" dmaaddr %#" PRIxPADDR "\n", dmaaddr);
__asm(".globl isa_dmastart_aftersync ; isa_dmastart_aftersync:");
#endif
Index: src/sys/dev/pci/cz.c
diff -u src/sys/dev/pci/cz.c:1.53 src/sys/dev/pci/cz.c:1.54
--- src/sys/dev/pci/cz.c:1.53 Thu Nov 26 15:17:09 2009
+++ src/sys/dev/pci/cz.c Mon Jul 26 22:33:24 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: cz.c,v 1.53 2009/11/26 15:17:09 njoly Exp $ */
+/* $NetBSD: cz.c,v 1.54 2010/07/26 22:33:24 jym Exp $ */
/*-
* Copyright (c) 2000 Zembu Labs, Inc.
@@ -73,7 +73,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cz.c,v 1.53 2009/11/26 15:17:09 njoly Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cz.c,v 1.54 2010/07/26 22:33:24 jym Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -613,8 +613,8 @@
cz->cz_fwctl = bus_space_read_4(cz->cz_win_st, cz->cz_win_sh,
ZFIRM_CTRLADDR_OFF);
#ifdef CZ_DEBUG
- aprint_debug_dev(&cz->cz_dev, "FWCTL structure at offset 0x%08lx\n",
- cz->cz_fwctl);
+ aprint_debug_dev(&cz->cz_dev, "FWCTL structure at offset "
+ "%#08" PRIxPADDR "\n", cz->cz_fwctl);
#endif
CZ_FWCTL_WRITE(cz, BRDCTL_C_OS, C_OS_BSD);
Index: src/sys/dev/pci/if_sk.c
diff -u src/sys/dev/pci/if_sk.c:1.67 src/sys/dev/pci/if_sk.c:1.68
--- src/sys/dev/pci/if_sk.c:1.67 Sun May 16 11:27:49 2010
+++ src/sys/dev/pci/if_sk.c Mon Jul 26 22:33:24 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: if_sk.c,v 1.67 2010/05/16 11:27:49 phx Exp $ */
+/* $NetBSD: if_sk.c,v 1.68 2010/07/26 22:33:24 jym Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -115,7 +115,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_sk.c,v 1.67 2010/05/16 11:27:49 phx Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_sk.c,v 1.68 2010/07/26 22:33:24 jym Exp $");
#include "rnd.h"
@@ -1597,8 +1597,8 @@
return;
}
- DPRINTFN(2, ("skc_attach: iobase=%lx, iosize=%lx\n", iobase,
- (u_long)iosize));
+ DPRINTFN(2, ("skc_attach: iobase=%#" PRIxPADDR ", iosize=%zx\n",
+ iobase, iosize));
#endif
sc->sc_dmatag = pa->pa_dmat;
Index: src/sys/dev/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.213 src/sys/dev/pci/if_wm.c:1.214
--- src/sys/dev/pci/if_wm.c:1.213 Wed Jul 21 15:35:39 2010
+++ src/sys/dev/pci/if_wm.c Mon Jul 26 22:33:24 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.213 2010/07/21 15:35:39 msaitoh Exp $ */
+/* $NetBSD: if_wm.c,v 1.214 2010/07/26 22:33:24 jym Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -76,7 +76,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.213 2010/07/21 15:35:39 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.214 2010/07/26 22:33:24 jym Exp $");
#include "rnd.h"
@@ -2627,10 +2627,10 @@
lasttx = nexttx;
DPRINTF(WM_DEBUG_TX,
- ("%s: TX: desc %d: low 0x%08lx, "
- "len 0x%04x\n",
+ ("%s: TX: desc %d: low %#" PRIxPADDR ", "
+ "len %#04zx\n",
device_xname(sc->sc_dev), nexttx,
- curaddr & 0xffffffffUL, (unsigned)curlen));
+ curaddr & 0xffffffffUL, curlen));
}
}
Index: src/sys/dev/pci/yds.c
diff -u src/sys/dev/pci/yds.c:1.49 src/sys/dev/pci/yds.c:1.50
--- src/sys/dev/pci/yds.c:1.49 Wed Feb 24 22:38:01 2010
+++ src/sys/dev/pci/yds.c Mon Jul 26 22:33:24 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: yds.c,v 1.49 2010/02/24 22:38:01 dyoung Exp $ */
+/* $NetBSD: yds.c,v 1.50 2010/07/26 22:33:24 jym Exp $ */
/*
* Copyright (c) 2000, 2001 Kazuki Sakamoto and Minoura Makoto.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: yds.c,v 1.49 2010/02/24 22:38:01 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: yds.c,v 1.50 2010/07/26 22:33:24 jym Exp $");
#include "mpu.h"
@@ -285,18 +285,18 @@
int i, j;
uint32_t *p;
uint32_t num;
- char *pa;
+ bus_addr_t pa;
for (i = 0; i < N_PLAY_SLOTS; i++) {
printf("pbankp[%d] = %p,", i*2, sc->pbankp[i*2]);
printf("pbankp[%d] = %p\n", i*2+1, sc->pbankp[i*2+1]);
}
- pa = (char *)DMAADDR(&sc->sc_ctrldata) + sc->pbankoff;
- p = (uint32_t *)sc->ptbl;
+ pa = DMAADDR(&sc->sc_ctrldata) + sc->pbankoff;
+ p = sc->ptbl;
printf("ptbl + 0: %d\n", *p++);
for (i = 0; i < N_PLAY_SLOTS; i++) {
- printf("ptbl + %d: 0x%x, should be %p\n",
+ printf("ptbl + %d: %#x, should be %#" PRIxPADDR "\n",
i+1, *p,
pa + i * sizeof(struct play_slot_ctrl_bank) *
N_PLAY_SLOT_CTRL_BANK);
@@ -449,8 +449,8 @@
mp = KERNADDR(p);
da = DMAADDR(p);
- DPRINTF(("mp:%p, DMA addr:%p\n",
- mp, (void *)sc->sc_ctrldata.map->dm_segs[0].ds_addr));
+ DPRINTF(("mp:%p, DMA addr:%#" PRIxPADDR "\n",
+ mp, sc->sc_ctrldata.map->dm_segs[0].ds_addr));
memset(mp, 0, memsize);
