CVS log for src/sys/arch/next68k/include/cpu.h

Up to [cvs.NetBSD.org] / src / sys / arch / next68k / include

Request diff between arbitrary revisions

Keyword substitution: kv
Default branch: MAIN

Largely unify the <machine/cpu.h> headers on the m68k platforms.

Consistently use "intr_depth" as the name of the interrupt depth counter
on m68k platforms.

Make the M68K_MMU_* defines real kernel options, available in opt_m68k_arch.h.
For 68030, 68040, and 68060, infer M68K_MMU_MOTOROLA.  For 68010 and 68020, it
must be an explicit option (set in std.${MACHINE} or, in the case of hp300,
inferred from the specific model option).

Switch next68k over to common interrupt dispatch and G/C __HAVE_LEGACY_INTRCNT.
Also included is G/C of the old ssir stuff that's no longer used.

Switch next68k over to the common m68k vector table.

Remove duplicated / slightly-tweaked loadustp() (load user segment table)
routines from all of the m68k ports using the shared pmap.  Instead, in
pmap_init(), set up a function pointer to the appropriate mmu_load_urp*()
function in mmu_subr.s.

Pull up following revision(s) (requested by tsutsui in ticket #88):

	sys/arch/next68k/next68k/nextrom.h: revision 1.13
	sys/arch/next68k/dev/nextdisplayvar.h: revision 1.6
	sys/arch/next68k/dev/intiovar.h: revision 1.8
	sys/arch/next68k/dev/nextcons.c: revision 1.12
	sys/arch/next68k/next68k/locore.s: revision 1.69
	sys/arch/next68k/dev/nextcons.c: revision 1.13
	sys/arch/next68k/dev/nextcons.c: revision 1.14
	sys/arch/next68k/dev/nextdisplay.c: revision 1.30
	sys/arch/next68k/stand/boot/boot.c: revision 1.13
	sys/arch/next68k/next68k/nextrom.c: revision 1.28
	sys/arch/next68k/next68k/nextrom.c: revision 1.29
	sys/arch/next68k/next68k/pmap_bootstrap.c: revision 1.46
	sys/arch/next68k/next68k/pmap_bootstrap.c: revision 1.47
	sys/arch/next68k/include/cpu.h: revision 1.52
	sys/arch/next68k/dev/intio.c: revision 1.17
	sys/arch/next68k/dev/intio.c: revision 1.18
	sys/arch/next68k/dev/intio.c: revision 1.19
	sys/arch/next68k/next68k/locore.s: revision 1.72
	sys/arch/next68k/stand/boot/version: revision 1.6
	sys/arch/next68k/include/bus_space.h: revision 1.21
	sys/arch/next68k/include/bus_space.h: revision 1.22
	sys/arch/next68k/dev/nextdisplay.c: revision 1.26
	sys/arch/next68k/include/bus_space.h: revision 1.23
	sys/arch/next68k/dev/nextdisplay.c: revision 1.27
	sys/arch/next68k/dev/nextdisplay.c: revision 1.28
	sys/arch/next68k/dev/nextdisplay.c: revision 1.29

Misc KNF and cosmetics.

Use proper C99 int types.

Remove trailing spaces and TABs.

Handle NeXT Turbo VRAM regions properly.
Info from Andreas Grabher on port-next68k@:
 https://mail-index.netbsd.org/port-next68k/2023/02/06/msg000052.html

Also refactor bus_space_map(9) and fix (unused) bus_space_mmap(9).

Add and check machine type NeXT_CUBE_TURBO (type 8).
Info from Andreas Grabher on port-next68k@.

NeXT Turbo Color doesn't have NEXT_P_C16_CMD_REG.
Info from Andreas Grabher on port-next68k@.

Bump version again to denote NeXT_CUBE_TURBO support.

Pull up following revision(s) (requested by tsutsui in ticket #1598):

	sys/arch/next68k/next68k/nextrom.h: revision 1.13
	sys/arch/next68k/dev/nextdisplayvar.h: revision 1.6
	sys/arch/next68k/dev/intiovar.h: revision 1.8
	sys/arch/next68k/dev/nextcons.c: revision 1.12
	sys/arch/next68k/next68k/locore.s: revision 1.69
	sys/arch/next68k/dev/nextcons.c: revision 1.13
	sys/arch/next68k/dev/nextcons.c: revision 1.14
	sys/arch/next68k/include/bus_space.h: revision 1.18
	sys/arch/next68k/dev/nextdisplay.c: revision 1.30
	sys/arch/next68k/include/bus_space.h: revision 1.19
	sys/arch/next68k/stand/boot/boot.c: revision 1.13
	sys/arch/next68k/next68k/nextrom.c: revision 1.28
	sys/arch/next68k/next68k/nextrom.c: revision 1.29
	sys/arch/next68k/next68k/pmap_bootstrap.c: revision 1.46
	sys/arch/next68k/next68k/pmap_bootstrap.c: revision 1.47
	sys/arch/next68k/include/cpu.h: revision 1.52
	sys/arch/next68k/dev/intio.c: revision 1.17 (patch)
	sys/arch/next68k/dev/intio.c: revision 1.18 (patch)
	sys/arch/next68k/dev/intio.c: revision 1.19 (patch)
	sys/arch/next68k/next68k/locore.s: revision 1.72
	sys/arch/next68k/stand/boot/version: revision 1.6
	sys/arch/next68k/include/bus_space.h: revision 1.21
	sys/arch/next68k/include/bus_space.h: revision 1.22
	sys/arch/next68k/dev/nextdisplay.c: revision 1.26
	sys/arch/next68k/include/bus_space.h: revision 1.23
	sys/arch/next68k/dev/nextdisplay.c: revision 1.27
	sys/arch/next68k/dev/nextdisplay.c: revision 1.28
	sys/arch/next68k/dev/nextdisplay.c: revision 1.29

 s/impliment/implement/ in comment.

Remove cargo-culted '#if 0' code that was designed to produce a
compile-time error if any of the bus_space_*_8 functions was used,
but was documented that it produces a link-time error.

Misc KNF and cosmetics.

Use proper C99 int types.

Remove trailing spaces and TABs.

Handle NeXT Turbo VRAM regions properly.
Info from Andreas Grabher on port-next68k@:
 https://mail-index.netbsd.org/port-next68k/2023/02/06/msg000052.html

Also refactor bus_space_map(9) and fix (unused) bus_space_mmap(9).

Add and check machine type NeXT_CUBE_TURBO (type 8).
Info from Andreas Grabher on port-next68k@.

NeXT Turbo Color doesn't have NEXT_P_C16_CMD_REG.
Info from Andreas Grabher on port-next68k@.

Bump version again to denote NeXT_CUBE_TURBO support.

Handle NeXT Turbo VRAM regions properly.

Info from Andreas Grabher on port-next68k@:
 https://mail-index.netbsd.org/port-next68k/2023/02/06/msg000052.html

Also refactor bus_space_map(9) and fix (unused) bus_space_mmap(9).

Pull up following revision(s) (requested by tsutsui in ticket #1581):

	sys/arch/next68k/next68k/machdep.c: revision 1.117
	sys/arch/next68k/dev/esp.c: revision 1.65
	sys/arch/next68k/include/cpu.h: revision 1.51
	sys/arch/next68k/include/bus_space.h: revision 1.20
	sys/arch/next68k/next68k/clock.c: revision 1.13

next68k: Fix delay_divisor value for proper delay(9) on 68040.

next68k: Specify proper constraints for bus_space_read region and multi ops.

These functions write the read data into memory at a specified pointer,
but without the "memory" constraint gcc could optimize out these ops
if the memory is allocated on local stack.

With this fix nextkbd(4) works again.
Should be pulled up to netbsd-10 and netbsd-9.

next68k: Fix silent stall of next68k esp(4) SCSI.

next68k esp(4) driver requires nextdma(4) interrupts at ipl 6
during ncr53c9x_intr() for esp(4) at ipl 3.  It worked on netbsd-5
and prior, but on netbsd-5 splbio() was changed from ipl 3 to 6
for SMP support and on netbsd-6 ncr53c9x driver was changed to
use mutex(9) instead of simple_lock(9), so nextdma interrupts
were no longer raised during ncr53c9x interrupt handler.

For now, just call mutex_exit(9) and mutex_enter(9) during
waiting nextdma(4) interrupts in MD esp_dma_intr() handler.

This could be wrong and the interrupt handler for nextdma should
be reorganized, but it just works.

Should be pulled up to netbsd-10 and netbsd-9.

Pull up following revision(s) (requested by tsutsui in ticket #63):

	sys/arch/next68k/next68k/machdep.c: revision 1.117
	sys/arch/next68k/dev/esp.c: revision 1.65
	sys/arch/next68k/include/cpu.h: revision 1.51
	sys/arch/next68k/include/bus_space.h: revision 1.20
	sys/arch/next68k/next68k/clock.c: revision 1.13

next68k: Fix delay_divisor value for proper delay(9) on 68040.

next68k: Specify proper constraints for bus_space_read region and multi ops.

These functions write the read data into memory at a specified pointer,
but without the "memory" constraint gcc could optimize out these ops
if the memory is allocated on local stack.

With this fix nextkbd(4) works again.
Should be pulled up to netbsd-10 and netbsd-9.

next68k: Fix silent stall of next68k esp(4) SCSI.

next68k esp(4) driver requires nextdma(4) interrupts at ipl 6
during ncr53c9x_intr() for esp(4) at ipl 3.  It worked on netbsd-5
and prior, but on netbsd-5 splbio() was changed from ipl 3 to 6
for SMP support and on netbsd-6 ncr53c9x driver was changed to
use mutex(9) instead of simple_lock(9), so nextdma interrupts
were no longer raised during ncr53c9x interrupt handler.

For now, just call mutex_exit(9) and mutex_enter(9) during
waiting nextdma(4) interrupts in MD esp_dma_intr() handler.

This could be wrong and the interrupt handler for nextdma should
be reorganized, but it just works.

Should be pulled up to netbsd-10 and netbsd-9.

next68k: Fix delay_divisor value for proper delay(9) on 68040.

Merge changes from current as of 20200406

cpu_need_resched():

- Remove all code that should be MI, leaving the bare minimum under arch/.
- Make the required actions very explicit.
- Pass in LWP pointer for convenience.
- When a trap is required on another CPU, have the IPI set it locally.
- Expunge cpu_did_resched().

Sync with HEAD

Refactor the 68040 writeback() from each m68k port's trap handler into a
shared copy: m68040_writeback().  It is essentially a copy of the Atari
version, with some minor cosmetic tweaks and one small performance optimization
from the mvme68k port.

Tested by rjs@ on a Quadra 950.  (Thanks!)

update from HEAD

Sync with HEAD

Sync with HEAD.  (Note that most of these changes are simply $NetBSD$
tag issues.)

Fix typo "one the" and architecture where appropriate.

Rebase to HEAD as of a few days ago.

sync with head.

for a reference, the tree before this commit was tagged
as yamt-pagecache-tag8.

this commit was splitted into small chunks to avoid
a limitation of cvs.  ("Protocol error: too many arguments")

sync with head

make cpu_need_resched() macros consistent; __USE flags

sync with head

merge to -current.

Always include <m68k/cpu.h> (i.e. outside #if defined(_KERNEL))
for crash(8) as amiga and sun3.  There are _KERNEL protections in it.

Briefly tested by "build.sh -m news68k -U build".
Further possible botch will be fixed later.

Sync with HEAD.

sync with head

- merge and move pasted m68k MD setreg() functions into m68k/m68k_machdep.c
- move m68881_save() and m68881_restore() declarations into <m68k/m68k.h>

Briefly tested and no obvious breakage on atari, sun3, and x68k.

sync with head

Sync with HEAD

Remove clause 3 (UCB advertising clause) from the University of Utah
copyright.  Confirmed by Mike Hibler, mike at cs.utah.edu - thanks!
Also, merge UCB and Utah copyright texts back into one, as they
originally were.

Extra verification by snj@.

Collect cpu_info and friends and move to m68k/include/cpu.h
Add a define __HAVE_CPU_DATA_FIRST which means that cpu_data is the first
member in struct cpu_info.

Sync with HEAD.

sync with head.

sync with head

fix PR 6724 - convert m68k options to defflag's.  this means that
M680[12346] are now available from opt_m68k_arch.h.  FPSP meantioned
in the PR has already been fixed, and i could not find any more.

i built these kernels to ensure i did not break their builds:

amiga: GENERIC DRACO
atari: HADES FALCON MILAN-PCIIDE
mac68k: GENERIC
sun2: GENERIC
sun3: GENERIC GENERIC3X
cesfic: attempted GENERIC, does not build due to lack of machine/bus.h
hp300: GENERIC
luna68k: GENERIC
mvme68k: GENERIC
news68k: GENERIC
next68k: GENERIC
x68k: GENERIC

sync with head

Remove uarea swap-out functionality:

- Addresses the issue described in PR/38828.
- Some simplification in threading and sleepq subsystems.
- Eliminates pmap_collect() and, as a side note, allows pmap optimisations.
- Eliminates XS_CTL_DATA_ONSTACK in scsipi code.
- Avoids few scans on LWP list and thus potentially long holds of proc_lock.
- Cuts ~1.5k lines of code.  Reduces amd64 kernel size by ~4k.
- Removes __SWAP_BROKEN cases.

Tested on x86, mips, acorn32 (thanks <mpumford>) and partly tested on
acorn26 (thanks to <bjh21>).

Discussed on <tech-kern>, reviewed by <ad>.

sync with HEAD

Merge the ppcoea-renovation branch to HEAD.

This branch was a major cleanup and rototill of many of the various OEA
cpu based PPC ports that focused on sharing as much code as possible
between the various ports to eliminate near-identical copies of files in
every tree.  Additionally there is a new PIC system that unifies the
interface to interrupt code for all different OEA ppc arches.  The work
for this branch was done by a variety of people, too long to list here.

TODO:
bebox still needs work to complete the transition to -renovation.
ofppc still needs a bunch of work, which I will be looking at.
ev64260 still needs to be renovated
amigappc was not attempted.

NOTES:
pmppc was removed as an arch, and moved to a evbppc target.

Sync with HEAD

sync with head.

Sync with HEAD.

Sync with HEAD.

Sync with HEAD.

Sync with HEAD.

TAB/space cleanup.

Add ci_cpuid where it's missing.

Sync with head.

Sync with head.

Update to HEAD.

Move declarations of m68k common functions
from <machine/cpu.h> to <m68k/m68k.h>.
While here, remove some obsolete function decls.

Remove obsolete "extern int want_resched" decls.

Adapt rest of m68k ports to yamt-idlelwp. Compile tested only.

Add missing call to lwp_startup() in lwp_trampoline() (which was renamed
from proc_trampoline to match the other ports).

A DIAGNOSTIC kernel will now boot and run.  LOCKDEBUG still doesn't work yet.
Also, my amiga no longer loses time.

Sync with HEAD.

Kill caddr_t; there will be some MI fallout, but it will be fixed shortly.

sync with head.

Remove spllowersoftclock() and CLKF_BASEPRI(), and always dispatch callouts
via a soft interrupt. In the near future, softclock will be run from process
context.

Merge newlock2 to head.

Update m68k pasteware.

merge ktrace-lwp.

sync with -current

Sync with HEAD.

de-__P, remove register, ansify.

Sync with HEAD

don't expose cpu_info to userland.

Sync with HEAD.

move some per-cpu data definitions to MI place so that they can be modified
without touching all ports.  discussed on tech-kern@.

Fix the sync with head I botched.

Sync with HEAD.

Sync with HEAD

Rearrange process exit path to avoid need to free resources from different
process context ('reaper').

From within the exiting process context:
* deactivate pmap and free vmspace while we can still block
* introduce MD cpu_lwp_free() - this cleans all MD-specific context (such
  as FPU state), and is the last potentially blocking operation;
  all of cpu_wait(), and most of cpu_exit(), is now folded into cpu_lwp_free()
* process is now immediatelly marked as zombie and made available for pickup
  by parent; the remaining last lwp continues the exit as fully detached
* MI (rather than MD) code bumps uvmexp.swtch, cpu_exit() is now same
  for both 'process' and 'lwp' exit

uvm_lwp_exit() is modified to never block; the u-area memory is now
always just linked to the list of available u-areas. Introduce (blocking)
uvm_uarea_drain(), which is called to release the excessive u-area memory;
this is called by parent within wait4(), or by pagedaemon on memory shortage.
uvm_uarea_free() is now private function within uvm_glue.c.

MD process/lwp exit code now always calls lwp_exit2() immediatelly after
switching away from the exiting lwp.

g/c now unneeded routines and variables, including the reaper kernel thread

Minor tweaks to the color framebuffer code -- still don't know what the deal
with the interrupt is.

Some small cleanup -- make the base,limit values vaddr_t, not char*.
Also add some code that attempts to deal with C16_VIDEO interrupts, though it
does not seem to make my color slabs work again.

Move UCB-licensed code from 4-clause to 3-clause licence.

Patches provided by Joel Baker in PR 22364, verified by myself.

Merge the nathanw_sa branch.

Use cpu_proc_fork().

Catch up to -current

merge the 12 copies of vm_machdep.c on the m68k platforms.
clean up some other stuff along the way, including:
 - use m68k/cacheops.*, remove duplicates from cpu.h.
 - centralize a few declarations in (all the copies of) cpu.h.
 - define M68K_VAC on platforms which have a VAC.
 - switch the sun platforms to the (now common) proc_trampoline().
 - do the phys_map thang on the sun platforms too, no reason not to.

sync kqueue with -current; this includes merge of gehenna-devsw branch,
merge of i386 MP branch, and part of autoconf rototil work

Catch up to -current.

Comprehensive patches from Christian Limpach:
* Fix problems with the DMA and SCSI drivers.
* Make turbo machines sort of work.
Additional fixes from me:
* Determine if we're a turbo at boot time, by looking at the ROM machine type.
* Set the display size correctly (1120 pixels wide, but padded to 1152 only on
  non-turbo machines).
Caveats:
* SCSI doesn't work on the turbo (or at least it blows chunks with no devices
  attached).
* Media selection doesn't work on the turbo (the BMAP stuff doesn't exist on
  turbo machines).
* The boot block is prone to timing out.

catch up with -current on kqueue branch

Catch up to -current.

Eliminate commons (including many used ones).  Clean up variable references.

Add a cpu_proc_fork(), called from uvm_proc_fork(), which takes care
of machine-dependent handling a fork() time (this is different from
forking the actual context in an LWP world).  #define it away on
platforms which do not need it.

Problem noted by Gregory McGarry.

MD Scheduler Activation bits for Next68k.
Compile-tested only.

Catch up to -current.

file cpu.h was added on branch nathanw_sa on 2001-11-18 18:43:06 +0000

use _KERNEL_OPT

turn on printf format-string checking and -Werror.  fix all warnings.

switch next68k to ELF.  highlight include:
add "%" prefix to register names in assembly code.
change assembly functions to return pointer values in %a0 instead of %d0.
C symbols no longer prepend an underscore, adjust assembly code for this.
32-bit values are now 32-bit aligned instead of 16-bit aligned,
adjust structure packing and padding to override this where necessary.
make EXEC_ELF std, make EXEC_AOUT and COMPAT_AOUT_M68K optional.
use the MI loadfile() instead of several home-grown versions.

Sync with HEAD

Unification of the m68k syscall() function.

Update thorpej_scsipi to -current as of a month ago
A i386 GENERIC kernel compiles without the siop, ahc and bha drivers
(will be updated later). i386 IDE/ATAPI and ncr work, as well as
sparc/esp_sbus. alpha should work as well (untested yet).
siop, ahc and bha will be updated once I've updated the branch to current
-current, as well as machine-dependant code.

pullup 1.14, approved by thorpej

add support for 12-bit color displays, from Timm Wetzel w/ changes by
me.  closes 10741.

add support for 12-bit color displays, from Timm Wetzel w/ changes by
me.  closes 10741.

Make need_resched() take a "struct cpu_info *" argument.  This
causes gives a primitive form of processor affinity.  Its use in
roundrobin() still needs some work.

First sweep at scheduler state cleanup.  Collect MI scheduler
state into global and per-CPU scheduler state:

	- Global state: sched_qs (run queues), sched_whichqs (bitmap
	  of non-empty run queues), sched_slpque (sleep queues).
	  NOTE: These may collectively move into a struct schedstate
	  at some point in the future.

	- Per-CPU state, struct schedstate_percpu: spc_runtime
	  (time process on this CPU started running), spc_flags
	  (replaces struct proc's p_schedflags), and
	  spc_curpriority (usrpri of processes on this CPU).

	- Every platform must now supply a struct cpu_info and
	  a curcpu() macro.  Simplify existing cpu_info declarations
	  where appropriate.

	- All references to per-CPU scheduler state now made through
	  curcpu().  NOTE: this will likely be adjusted in the future
	  after further changes to struct proc are made.

Tested on i386 and Alpha.  Changes are mostly mechanical, but apologies
in advance if it doesn't compile on a particular platform.

Define cpu_number() as discussed on tech-smp.

Applied patches from Matt Debergalis <deberg@mit.edu>.
These patches include:
  Added framebuffer mapping for color framebuffer to support color wscons
    which is coming soon.
  Renamed wskbdmap_mfii[ch] to wskbdmap_next[ch]
  Changed video to be white on black instead of black on white.
  Now handles and discards mouse interrupts.
  Video and keyboard is now working on mono machines.

synchronize types, and s/curproc/p/ in one forgotten place

next68k specific part of PR 6152 fix

Applied supplied patches from pr port-next68k/6709
add bus_space support for mono framebuffer

Changes to support fork_kthread():
- cpu_set_kpc() now takes void *arg third argument, passed to the
  entry point.
- cpu_fork() allows parent to be non-curproc iff parent is proc0.
  When forking non-curproc, assume its state has already been saved.
- Adjust various pieces of machine-dependent code to account of all of this.

Sync'ed more files and routines with mvme port in prepartion for UVM.
Now use generic m68k cachops everywhere rather than defining them in locore.s

Fixed typo in printf bitfields for intrstat register.

added a flag to disable the NEXT_SLOT_ID_BMAP for testing the turbo machines

Started the esp scsi driver.
Fixed bus_space_handle_t in nextdma device.
Fixed scsi interrupt define.

Initial import of NetBSD/next68k.

Initial revision