Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-8]: src/sys/arch Pull up following revision(s) (requested by skrl...
details: https://anonhg.NetBSD.org/src/rev/d33798037a10
branches: netbsd-8
changeset: 850791:d33798037a10
user: martin <martin%NetBSD.org@localhost>
date: Wed Jul 05 15:48:01 2017 +0000
description:
Pull up following revision(s) (requested by skrll in ticket #83):
sys/arch/cats/cats/cats_machdep.c: revision 1.84
sys/arch/arm/footbridge/footbridge_io.c: revision 1.23
sys/arch/cats/conf/GENERIC: revision 1.162
Use devmap if available
Now that bus_space can use devmap - use it for early console
Comment out a bunch of thing so that a GENERIC kernel boots on my cats
with cyclone firmware
diffstat:
sys/arch/arm/footbridge/footbridge_io.c | 17 ++++-
sys/arch/cats/cats/cats_machdep.c | 6 +-
sys/arch/cats/conf/GENERIC | 88 ++++++++++++++++----------------
3 files changed, 59 insertions(+), 52 deletions(-)
diffs (258 lines):
diff -r 6ac7f5199324 -r d33798037a10 sys/arch/arm/footbridge/footbridge_io.c
--- a/sys/arch/arm/footbridge/footbridge_io.c Wed Jul 05 13:58:48 2017 +0000
+++ b/sys/arch/arm/footbridge/footbridge_io.c Wed Jul 05 15:48:01 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: footbridge_io.c,v 1.22 2014/02/22 20:33:00 matt Exp $ */
+/* $NetBSD: footbridge_io.c,v 1.22.22.1 2017/07/05 15:48:01 martin Exp $ */
/*
* Copyright (c) 1997 Causality Limited
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: footbridge_io.c,v 1.22 2014/02/22 20:33:00 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: footbridge_io.c,v 1.22.22.1 2017/07/05 15:48:01 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -182,8 +182,8 @@
footbridge_mem_bs_map(void *t, bus_addr_t bpa, bus_size_t size, int flags,
bus_space_handle_t *bshp)
{
- bus_addr_t startpa, endpa, pa;
- vaddr_t va;
+ paddr_t startpa, endpa, pa;
+ const struct pmap_devmap *pd;
/* Round the allocation to page boundries */
startpa = trunc_page(bpa);
@@ -200,12 +200,19 @@
return 0;
}
+ pa = bpa;
+ if ((pd = pmap_devmap_find_pa(pa, size)) != NULL) {
+ /* Device was statically mapped. */
+ *bshp = pd->pd_va + (pa - pd->pd_pa);
+ return 0;
+ }
+
/*
* Eventually this function will do the mapping check for overlapping /
* multiple mappings
*/
- va = uvm_km_alloc(kernel_map, endpa - startpa, 0,
+ vaddr_t va = uvm_km_alloc(kernel_map, endpa - startpa, 0,
UVM_KMF_VAONLY | UVM_KMF_NOWAIT);
if (va == 0)
return ENOMEM;
diff -r 6ac7f5199324 -r d33798037a10 sys/arch/cats/cats/cats_machdep.c
--- a/sys/arch/cats/cats/cats_machdep.c Wed Jul 05 13:58:48 2017 +0000
+++ b/sys/arch/cats/cats/cats_machdep.c Wed Jul 05 15:48:01 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: cats_machdep.c,v 1.83 2017/03/19 12:46:21 skrll Exp $ */
+/* $NetBSD: cats_machdep.c,v 1.83.6.1 2017/07/05 15:48:01 martin Exp $ */
/*
* Copyright (c) 1997,1998 Mark Brinicombe.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cats_machdep.c,v 1.83 2017/03/19 12:46:21 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cats_machdep.c,v 1.83.6.1 2017/07/05 15:48:01 martin Exp $");
#include "opt_ddb.h"
#include "opt_modular.h"
@@ -266,7 +266,7 @@
pmap_devmap_bootstrap((vaddr_t)ebsabootinfo.bt_l1, cats_devmap);
#ifdef FCOM_INIT_ARM
- fcomcnattach(DC21285_ARMCSR_BASE, comcnspeed, comcnmode);
+ fcomcnattach(DC21285_ARMCSR_VBASE, comcnspeed, comcnmode);
#endif
/* Talk to the user */
diff -r 6ac7f5199324 -r d33798037a10 sys/arch/cats/conf/GENERIC
--- a/sys/arch/cats/conf/GENERIC Wed Jul 05 13:58:48 2017 +0000
+++ b/sys/arch/cats/conf/GENERIC Wed Jul 05 15:48:01 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.161 2016/12/13 20:42:16 christos Exp $
+# $NetBSD: GENERIC,v 1.161.8.1 2017/07/05 15:48:02 martin Exp $
#
# GENERIC machine description file
#
@@ -53,22 +53,22 @@
# File systems
file-system FFS # UFS
-file-system LFS # log-structured file system
+#file-system LFS # log-structured file system
file-system MFS # memory file system
file-system NFS # Network file system
-file-system ADOSFS # AmigaDOS-compatible file system
-file-system EXT2FS # second extended file system (linux)
+#file-system ADOSFS # AmigaDOS-compatible file system
+#file-system EXT2FS # second extended file system (linux)
file-system CD9660 # ISO 9660 + Rock Ridge file system
file-system MSDOSFS # MS-DOS file system
file-system FDESC # /dev/fd
file-system KERNFS # /kern
file-system NULLFS # loopback file system
-file-system OVERLAY # overlay filesystem
+#file-system OVERLAY # overlay filesystem
file-system PUFFS # Userspace file systems (e.g. ntfs-3g & sshfs)
file-system PROCFS # /proc
file-system UMAPFS # NULLFS + uid and gid remapping
file-system UNION # union file system
-file-system CODA # Coda File System; also needs vcode (below)
+#file-system CODA # Coda File System; also needs vcode (below)
file-system PTYFS # /dev/pts/N support
file-system TMPFS # Efficient memory file-system
#file-system UDF # experimental - OSTA UDF CD/DVD file-system
@@ -92,7 +92,7 @@
#options IPSEC_DEBUG # debug for IP security
#options MROUTING # IP multicast routing
#options PIM # Protocol Independent Multicast
-options NETATALK # AppleTalk networking
+#options NETATALK # AppleTalk networking
options PPP_BSDCOMP # BSD-Compress compression support for PPP
options PPP_DEFLATE # Deflate compression support for PPP
options PPP_FILTER # Active filter support for PPP (requires bpf)
@@ -154,7 +154,7 @@
# Miscellaneous kernel options
options KTRACE # system call tracing, a la ktrace(1)
-options IRQSTATS # manage IRQ statistics
+#options IRQSTATS # manage IRQ statistics
options SCSIVERBOSE # Verbose SCSI errors
options PCIVERBOSE # Verbose PCI descriptions
options MIIVERBOSE # verbose PHY autoconfig messages
@@ -221,8 +221,8 @@
# Cryptographic Devices
# PCI cryptographic devices
-hifn* at pci? dev ? function ? # Hifn 7755/7811/795x
-ubsec* at pci? dev ? function ? # Broadcom 5501/5601/580x/582x
+#hifn* at pci? dev ? function ? # Hifn 7755/7811/795x
+#ubsec* at pci? dev ? function ? # Broadcom 5501/5601/580x/582x
# PCI serial interfaces
@@ -233,29 +233,29 @@
#lpt* at puc? port ? # || ports on "universal" comm boards
# PCI SCSI Controllers and Buses
-adv* at pci? dev ? function ? # AdvanSys 1200[A,B], ULTRA SCSI
-scsibus* at adv?
+#adv* at pci? dev ? function ? # AdvanSys 1200[A,B], ULTRA SCSI
+#scsibus* at adv?
#adw* at pci? dev ? function ? # AdvanSys 9xxUW SCSI
#scsibus* at adw?
-ahc* at pci? dev ? function ? # Adaptec [23]94x, aic78x0 SCSI controllers
-scsibus* at ahc?
+#ahc* at pci? dev ? function ? # Adaptec [23]94x, aic78x0 SCSI controllers
+#scsibus* at ahc?
#bha* at pci? dev ? function ? # BusLogic 9xx SCSI
#scsibus* at bha?
-iha* at pci? dev ? function ? # Initio INIC-940/950 SCSI
-scsibus* at iha?
+#iha* at pci? dev ? function ? # Initio INIC-940/950 SCSI
+#scsibus* at iha?
#isp* at pci? dev ? function ? # Qlogic ISP 10x0 SCSI controllers
#scsibus* at isp?
-pcscp* at pci? dev ? function ? # AMD 53c974 PCscsi-PCI SCSI
-scsibus* at pcscp?
-siop* at pci? dev ? function ? # NCR 53c8xx SCSI
-scsibus* at siop?
-esiop* at pci? dev ? function ? # NCR 53c875 SCSI and newer
-scsibus* at esiop?
+#pcscp* at pci? dev ? function ? # AMD 53c974 PCscsi-PCI SCSI
+#scsibus* at pcscp?
+#siop* at pci? dev ? function ? # NCR 53c8xx SCSI
+#scsibus* at siop?
+#esiop* at pci? dev ? function ? # NCR 53c875 SCSI and newer
+#scsibus* at esiop?
# SCSI devices
-sd* at scsibus? target ? lun ? # SCSI disk drives
-st* at scsibus? target ? lun ? # SCSI tape drives
-cd* at scsibus? target ? lun ? # SCSI CD-ROM drives
+#sd* at scsibus? target ? lun ? # SCSI disk drives
+#st* at scsibus? target ? lun ? # SCSI tape drives
+#cd* at scsibus? target ? lun ? # SCSI CD-ROM drives
#ch* at scsibus? target ? lun ? # SCSI auto-changers
#uk* at scsibus? target ? lun ? # SCSI unknown device
#ss* at scsibus? target ? lun ? # SCSI scanner
@@ -265,20 +265,20 @@
# The 0x0001 flag force the driver to use DMA, even if the driver doesn't know
# how to set up DMA modes for this chip. This may work, or may cause
# a machine hang with some controllers.
-pciide* at pci? dev ? function ? flags 0x0000 # GENERIC pciide driver
-acardide* at pci? dev ? function ? # Acard IDE controllers
+#pciide* at pci? dev ? function ? flags 0x0000 # GENERIC pciide driver
+#acardide* at pci? dev ? function ? # Acard IDE controllers
aceride* at pci? dev ? function ? # Acer Lab IDE controllers
-artsata* at pci? dev ? function ? # Intel i31244 SATA controller
-cmdide* at pci? dev ? function ? # CMD tech IDE controllers
-cypide* at pci? dev ? function ? # Cypress IDE controllers
-hptide* at pci? dev ? function ? # Triones/HighPoint IDE controllers
-optiide* at pci? dev ? function ? # Opti IDE controllers
-pdcide* at pci? dev ? function ? # Promise IDE controllers
-pdcsata* at pci? dev ? function ? # Promise SATA150 controllers
-satalink* at pci? dev ? function ? # SiI SATALink controllers
-siside* at pci? dev ? function ? # SiS IDE controllers
-slide* at pci? dev ? function ? # Symphony Labs IDE controllers
-viaide* at pci? dev ? function ? # VIA/AMD/Nvidia IDE controllers
+#artsata* at pci? dev ? function ? # Intel i31244 SATA controller
+#cmdide* at pci? dev ? function ? # CMD tech IDE controllers
+#cypide* at pci? dev ? function ? # Cypress IDE controllers
+#hptide* at pci? dev ? function ? # Triones/HighPoint IDE controllers
+#optiide* at pci? dev ? function ? # Opti IDE controllers
+#pdcide* at pci? dev ? function ? # Promise IDE controllers
+#pdcsata* at pci? dev ? function ? # Promise SATA150 controllers
+#satalink* at pci? dev ? function ? # SiI SATALink controllers
+#siside* at pci? dev ? function ? # SiS IDE controllers
+#slide* at pci? dev ? function ? # Symphony Labs IDE controllers
+#viaide* at pci? dev ? function ? # VIA/AMD/Nvidia IDE controllers
# ATA (IDE) bus support
atabus* at ata?
@@ -540,8 +540,8 @@
# Pseudo-Devices
-pseudo-device crypto # /dev/crypto device
-pseudo-device swcrypto # software crypto implementation
+#pseudo-device crypto # /dev/crypto device
+#pseudo-device swcrypto # software crypto implementation
# disk/mass storage pseudo-devices
pseudo-device ccd # concatenated/striped disk devices
@@ -555,12 +555,12 @@
# network pseudo-devices
pseudo-device bpfilter # Berkeley packet filter
#pseudo-device carp # Common Address Redundancy Protocol
-pseudo-device ipfilter # IP filter (firewall) and NAT
+#pseudo-device ipfilter # IP filter (firewall) and NAT
pseudo-device loop # network loopback
pseudo-device ppp # Point-to-Point Protocol
pseudo-device pppoe # PPP over Ethernet (RFC 2516)
-pseudo-device sl # Serial Line IP
-pseudo-device strip # Starmode Radio IP (Metricom)
+#pseudo-device sl # Serial Line IP
+#pseudo-device strip # Starmode Radio IP (Metricom)
pseudo-device tun # network tunneling over tty
pseudo-device tap # virtual Ethernet
pseudo-device gre # generic L3 over IP tunnel
@@ -584,7 +584,7 @@
pseudo-device clockctl # user control of clock subsystem
# a pseudo device needed for Coda # also needs CODA (above)
-pseudo-device vcoda # coda minicache <-> venus comm.
+#pseudo-device vcoda # coda minicache <-> venus comm.
# mouse & keyboard multiplexor pseudo-devices
pseudo-device wsmux
Home |
Main Index |
Thread Index |
Old Index