CVS log for src/sys/arch/sparc/dev/zs.c

Up to [cvs.NetBSD.org] / src / sys / arch / sparc / dev

Request diff between arbitrary revisions

Keyword substitution: kv
Default branch: MAIN

Add missing double p and d for stopped and overriden accordingly.
Fix few more typos along the way, mainly in copy-pasted comments.

Merge thorpej-cfargs2.

Adapt to CFARGS().

Merge thorpej-cfargs branch:

Simplify and make extensible the config_search() / config_found() /
config_attach() interfaces: rather than having different variants for
which arguments you want pass along, just have a single call that
takes a variadic list of tag-value arguments.

Adjust all call sites:
- Simplify wherever possible; don't pass along arguments that aren't
  actually needed.
- Don't be explicit about what interface attribute is attaching if
  the device only has one.  (More simplification.)
- Add a config_probe() function to be used in indirect configuiration
  situations, making is visibly easier to see when indirect config is
  in play, and allowing for future change in semantics.  (As of now,
  this is just a wrapper around config_match(), but that is an
  implementation detail.)

Remove unnecessary or redundant interface attributes where they're not
needed.

There are currently 5 "cfargs" defined:
- CFARG_SUBMATCH (submatch function for direct config)
- CFARG_SEARCH (search function for indirect config)
- CFARG_IATTR (interface attribte)
- CFARG_LOCATORS (locators array)
- CFARG_DEVHANDLE (devhandle_t - wraps OFW, ACPI, etc. handles)

...and a sentinel value CFARG_EOL.

Add some extra sanity checking to ensure that interface attributes
aren't ambiguous.

Use CFARG_DEVHANDLE in MI FDT, OFW, and ACPI code, and macppc and shark
ports to associate those device handles with device_t instance.  This
will trickle trough to more places over time (need back-end for pre-OFW
Sun OBP; any others?).

Give config_found() the same variadic arguments treatment as
config_search().  This commit only adds the CFARG_EOL sentinel
to the existing config_found() calls.  Conversion of config_found_sm_loc()
and config_found_ia() call sites will be in subsequent commits.

Resync to 2012-11-19 00:00:00 UTC

sync with head

split device_t/softc for all remaining drivers.
replace "struct device *" with "device_t".
use device_xname(), device_unit(), etc.

Apply patches (requested by mrg in ticket #1564):
	sys/arch/sparc/dev/zs.c:		patch
	sys/arch/sparc/include/cpu.h:		patch
	sys/arch/sparc/include/z8530var.h:	patch
	sys/arch/sparc/sparc/cpu.c:		patch
	sys/arch/sparc/sparc/cpuvar.h:		patch
	sys/arch/sparc/sparc/db_interface.c:	patch
	sys/arch/sparc/sparc/genassym.cf:	patch
	sys/arch/sparc/sparc/intr.c:		patch
	sys/arch/sparc/sparc/locore.s:		patch
	sys/arch/sparc/sparc/machdep.c:		patch
	sys/arch/sparc/sparc/timer.c:		patch
	sys/arch/sparc/sparc/timer_sun4m.c:	patch
	sys/arch/sparc/sparc/timervar.h:	patch
	sys/arch/sparc/sparc/trap.c:		patch
	sys/arch/sparc/sparc/vm_machdep.c:	patch

- fix a panic in savefpstate.  idea, and code suggestions from uwe
- convert xpmsg_lock to IPL_SCHED.  the old spl/simple_lock code ran at
  splsched(), and this significantly helps with stability under load when
  running with multiple active CPUs
- in strayintr() don't print about stray zs inters in MP case
- fix a deadlock in xcall()
- consolidate the interrupt evcnt(9) into a full set of per-IPL per-CPU
  soft/hard counters
- fix xcall() failure messages in some cases
- addd new ddb command "mach xcall"
- use schedintr() (not schedintr_4m()) on MP or single CPU configurations
- call hardclock() the same way on cpu0 in MP and !MP cases
- request the appropriate stack space for nmi_sun4m, in particular,
  make sure we have space for %g2...%g5.  now entering ddb via eg,
  serial break no longer causes cpu1 to fault.
- give memfault_sun*() some entry points that both gdb and ddb will find.
from tsutsui:
- fix panic in interrupt handlers in zs

Pull up following revision(s) (requested by mrg in ticket #1526):
	sys/arch/sparc/dev/zs.c: revision 1.115
	sys/dev/ic/z8530sc.h: revision 1.26
	sys/dev/ic/z8530sc.c: revision 1.30
	sys/dev/ic/z8530tty.c: revision 1.127
	sys/arch/sparc64/dev/zs.c: revision 1.68
add two new functions for z8530tty: zs_chan_lock() and zs_chan_unlock(),
and use them instead of various spl's in the zs.c's.
reviewed by ad and martin.

Sync with HEAD.

sync with head.

sync with head

Remove an unused variable.

Establish interrupt handlers with proper softc per each zs device
rather than sharing them among all zs devices and searching softc
in handlers.

The latter method is derived from ancient sun3 zs driver which tried
to reduce overhead on autovectored interrupts, but nowadays such hack
might cause recursive global locks on modern SMP capable framework.

Fixes "5.99.30 sparc panic during startup" reported by Hauke Fath
on tech-kern@:
http://mail-index.NetBSD.org/tech-kern/2010/06/19/msg008374.html
and also tested by Jochen Kunz on SS20 with both serial and kbd console.

Ok'ed by mrg@ and dyoung@.

make sure we pass a valid consdev pointer to the console keyboard so kbd
knows it's console and passes the right flags to wskbd, now the wskbd will
not drop off the mux when leaving event mode.
Symptoms: now the keyboard should no longer be dead when leaving X and there
          should be no more panics caused by it
I tested this on an SS5 and an SS20, may need some more attention and zs.c
sure could use some cleanup - there are a few differences to sparc64 that
really don't make much sense to me, like not passing console flags to zstty
which sparc64 does but sparc avoids, which caused this problem in the first
place.

sync to netbsd-5

sync with head

Make sure to set ZS_HWFLAG_USE_CONSDEV and zs_consdev into zsc_args
passed to child devices even in !(NWSKBD == 0) case so that zs console
functions are actually used rather than the default prom console.
Fixes stray interrupts on MP machines running GENERIC.MP kernel with
zs serial console.

Ok'ed by mrg@.

sync with head

Pull up following revision(s) (requested by martin in ticket #800):
	sys/arch/sparc/dev/zs.c: revision 1.116
Properly initialize child attach args to zero - we could end up with
various devices having different ideas about being console otherwise.

Pull up following revision(s) (requested by martin in ticket #800):
	sys/arch/sparc/dev/zs.c: revision 1.116
Properly initialize child attach args to zero - we could end up with
various devices having different ideas about being console otherwise.

Properly initialize child attach args to zero - we could end up with
various devices having different ideas about being console otherwise.

add two new functions for z8530tty: zs_chan_lock() and zs_chan_unlock(),
and use them instead of various spl's in the zs.c's.

reviewed by ad and martin.

KNF, same object code generated

Sync with HEAD.

Commit is split, to avoid a "too many arguments" protocol error.

sync with head.

Sync with HEAD.

bcopy -> memcpy

Sync with HEAD.

Sync with HEAD.

Update haad-dm branch to haad-dm-base2.

Pull up following revision(s) (requested by martin in ticket #77):
	sys/arch/sparc/dev/zs.c: revision 1.112
PR port-sparc/39942: ifdef ch0_is_cons declaration and all uses
consistently

PR port-sparc/39942: ifdef ch0_is_cons declaration and all uses consistently

Sync with HEAD.

Sync w/ -current. 34 merge conflicts to follow.

Sync with head.

sync with head.

use device_lookup_private to get softc

Sync with HEAD.

sync with head.

sync with head.

Remove clause 3 and 4 from TNF licenses

Sync with HEAD.

Split softc and device_t for zsc(4) and its children.

XXX we should restructure MI APIs and make it really machine independent.

sync with HEAD

Sync with HEAD.

sync with head

Sync with HEAD.

Sync with HEAD.

Use the softint API.

Sync with HEAD.

sync with head.

Sync with HEAD

Sync with HEAD.

Call zs_lock_init() to set up the chanstate's lock.

sync with head.

Sync with head.

Sync with head.

sync with head.

Final steps to for working wscons on sun-4 class machines.  Restructure
the previous revision so that we don't tell the common zs code that we
are the console if we're using wscons.  Thanks to wrstuden@ for the hints.

sync with head.

Sync with HEAD.

First steps for working wscons on sun-4 class machines - recognise the
console keyboard and mouse on them.

We are not there yet because currently both wsdisplay and zstty assume
that they are the console.  On sun-4, zstty wins because it attaches
last and overwrites the console device that wscons had set previously.

sync with head

sync with head.

Sync with head.

sync with head.

Use device_is_a().

Sync with head.

sync with head.

ANSIify function declarations/defintions.  Use uint<N>_t.
Propagate "static" to function definitions.  Drop trailing whitespace.
Same binary code is produced for GENERIC.MP + KGDB + DDB.

Sync with HEAD. Here we go again...

Allow sparc64-style attachment of mouse and keyboard via zstty, needed for
wscons support.
Reviewed by uwe.

Fix the sync with head I botched.

Sync with HEAD.

Sync with HEAD

add some SUN4D stuff.
zs and zstty no longer need "needs-count" or "needs-flag",
so get rid of those and wild-card the extra zs devices on SUN4D.

Rename PROM_getprop*() => prom_getprop*().

Uppercase CPU, plural is CPUs.

__KERNEL_RCSID()

Provide locking required by the interrupt handlers running at IPL_SERIAL.

Set the interrupt target to the current CPU when directly accessing
the chip for console I/O.

Sync with HEAD.

XXX ALT_SWITCH_CODE is not yet LWP'ified.

Use aprint_normal() for cfprint routines.

Sync with HEAD.

Remove the `flags' argument from bus_intr_establish().

Finish the switch to the softintr(9) framework.

To make this work, we now have to use separate handler lists for hardware
and software interrupts as the soft interrupt handlers do not return
an `interrupt handled' status.

Thanks to Matt Fredette for providing an initial set of patches on port-sparc.

Pull up revision 1.92 (requested by jdc in ticket #908):
  Check only the physical address of serial ports on a Sun4.

Catch up to -current.

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

Check only the physical address of serial ports on a Sun 4.

Reviewed by Uwe.

Add trailing ; to CFATTACH_DECL.

Use CFATTACH_DECL().

Declare all cfattach structures const.

Rather than referencing the cfdriver directly in the cfdata entries,
instead use a string naming the driver.  The cfdriver is then looked
up in a list which is built at run-time.

Catch up to -current.

Merge the gehenna-devsw branch into the trunk.

This merge changes the device switch tables from static array to
dynamically generated by config(8).

- All device switches is defined as a constant structure in device drivers.

- The new grammer ``device-major'' is introduced to ``files''.

	device-major <prefix> char <num> [block <num>] [<rules>]

- All device major numbers must be listed up in port dependent majors.<arch>
  by using this grammer.

- Added the new naming convention.
  The name of the device switch must be <prefix>_[bc]devsw for auto-generation
  of device switch tables.

- The backward compatibility of loading block/character device
  switch by LKM framework is broken. This is necessary to convert
  from block/character device major to device name in runtime and vice versa.

- The restriction to assign device major by LKM is completely removed.
  We don't need to reserve LKM entries for dynamic loading of device switch.

- In compile time, device major numbers list is packed into the kernel and
  the LKM framework will refer it to assign device major number dynamically.

sync kqueue branch with HEAD

catch up with -current.

Catch up to -current.

Add autoconfiguration support for the Sun4d "bootbus".  Add a
zs @ bootbus attachment.

Remove hard-coded major.

Catch up to -current.
(CVS: It's not just a program. It's an adventure!)

Catch up with -current.

* `bus_type_t' is gone.
* Use BUS_ADDR() where appropriate to encode I/O space and physical
  address offset into a `bus_addr_t' value.
* Drop obio_bus_map() since it's now completely equivalent to bus_space_map()
* Use bus_space_map2() to map device space at a fixed virtual address.
* Remove the virtual address argument from sbus_sbus_addr()

Sync kqueue branch with -current.

Catch up with -current.

file zs.c was added on branch nathanw_sa on 2002-04-01 07:42:44 +0000

getprop* -> PROM_getprop*

KGDB needs both zs_putc and zs_getc; make them non-static.

Catch up to -current.

Pull in "opt_kgdb.h"; see PR#13036.

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.

Pull up revision 1.81 (requested by pk):
  Account for the top-most 4 bits of obio addresses being zero on
  sun 4/100 machines when inferring zs PROM device numbers from the
  physical address.

Account for the top-most 4 bits of obio addresses being zero on sun 4/100
machines, when inferring zs PROM device numbers from the physical address.

pull up sparc/sparc64 bus_intr_establish() changes, necessary for sparc64
(originally done by pk, approved by thorpej):

>Add a `device class' interrupt level argument (from machine/intr.h)
>to bus_interrupt_establish().
>
>It's currently only used in sparc64/dev/psycho.c to assign a CPU interrupt
>level to devices in PCI slots.

Add a `device class' interrupt level argument (from machine/intr.h)
to bus_interrupt_establish().

It's currently only used in sparc64/dev/psycho.c to assign a CPU interrupt
level to devices in PCI slots.

Sync w/ netbsd-1-5-base.

Implement the more flexiable `evcnt' interface as discussed (briefly) on
tech-kern and now documented in evcnt(9).

Apply patch (requested by pk):
  Fix a NULL pointer dereference when a zs device interrupts during
  autoconfiguration of subdevices (keyboard & mouse).

Delete debugging printf().

Just don't force the baud rate in the driver, ever.

Revise console device handling:
	* do not require a `zs' driver for console handling
	* run the console on PROM primitives until a device recognises
	  itself as a console device during normal autoconfiguration.
	* allow (keyboard) devices to take over the input channel of
	  the PROM primitive-based console device.

As a result, consinit() is much simplified and does no longer have
to "detect" devices to setup a working console device. This complexity
has moved to individual drivers which interpret the PROM information
after they have attached to decide whether or not to act as a console.

Add power management hooks.

- Implement cnbell() -- ring the console bell.  The cn_bell entrypoint
  is optional.
- Add cn_bell to statically allocated consdevs as appropriate.

Just skip matching the `slave' property against `cf_unit'.

Eliminate much of the goo in setting up zs device addressing.

Pull up revision 1.70 (requested by pk):
  Two fixes:
   o Fix out of bound indexing of buffer.
   o Default to first serial port if console property is absent.

Pull up to last week's -current.

Check presence of Sbus interrupt properties before using them.

Sync with -current

Handle empty `input/output path' when looking for console device; patch
from Brian D. Chase.

Add pps support. Only enable pps if CLOCAL & !MDMBUF.

consinit: cover all cases.

Sanatize consinit() a bit.

Since V2 & V3 proms already pass us ihandles for stdin and stdout,
there's no need to open the device a second time. It suffices to
just convert the `ihandles' to `phandles'.

Use promlib version correctly.

Use the PROMLIB interface.

Minor cleanup.
Make the initializer for BAUDLO depend on PCLK directly; it was incorrect on
some ports where PCLK is not 4.9152MHz.
XXX Is the default value actually used?

Don't set DCD_IE in the frontends.  KGDB doesn't even use DCD, and the tty
frontends get it from zsparam() anyway.

defopt DDB.

Pull up 1.59-1.60, per request of mycroft.

fix a timing problem with polled output on sun4c's.

Eliminate cs_heldchar.  It is not necessary in my version of the driver.

obio_bus_probe() => bus_space_probe()

Account for changed bus attachment scheme.

KNF, and use splzs over splhigh in one place.

Update for changes to config.

Pull rev 1.54 up from trunk (pk)

If necessary, defer console output until TX interrupt handler runs.

Pull rev 1.52 and 1.53 up from trunk (mycroft)

Handle CDTRCTS, for silly Mac-like connector on some models (e.g. IPX).

Set rr0_dcd.
Don't set DCD_IE and CTS_IE here; let the MI code do it.
Handle MDMBUF.

Pull rev 1.51 up from trunk

Correct the values of zs_unit in consinit(),
so ddb will work on the keyboard/display.

Use common zs code.

Update marc-pcmcia branch from trunk.

Allow a BREAK to cause a kgdb_connect().

%x -> 0x%x

Avoid race for the chip's interrupt pending status bits in zscnputc()
by introducing a single-character queue to defer kernel console output
until the transmitter interrupt handler runs.

as per discussion with torek, allow TC=1.  also add option
to allow TC=0.  the zilog documentation says not to allow
TC=0 -- however, i tested this and it "does work", as far
as i could tell, so, allow this use if so desired.

Comply with recent autoconfiguration changes. Diffs graciously
supplied by Chris Demetriou.

backout previous kprintf change

printf -> kprintf, sprintf -> ksprintf

tty stop functions really should return void, not int, and certainly not both.

pull up tty stats "bug fix".

Put back a `#if defined(SUN4M)' for now.

We really need a ring buffer for every unit.
Eliminate extraneous ttyalloc() calls.

find a couple minor nits from previous change.

change zsinfo to a zs_softc, and impliment intr counts.  mostly from OpenBSD.

Eliminated dependencies on dev_conf.h

Various cleanup; mostly trailing spaces/tabs.

New device attachment scheme:

	- split softc size and match/attach out from cfdriver into
	  a new struct cfattach.

	- new "attach" directive for files.*.  May specify the name of
	  the cfattach structure, so that devices may be easily attached
	  to parents with different autoconfiguration semantics.

Bring prototypes into scope and fix compiler warnings.

Use CPU-type macros.

Extend the size of the "soft" FIFOs which reportedly reduces the number
of FIFO overflows on high baud rates.
However, doing so on all 4 ports would cost a whopping 64KB (at 4096 entries
per FIFO) of kernel memory. So, the FIFOs are now allocated at attach time
allowing the size for the keyboard and mouse ports to be reduced (to 128)
which should be adequate for the 1200 baud they use.

note that most of dev/ic's contents have changed names

Small optimisation & 1 fewer depedency on zs_ctty.

Use ZS_DELAY() in a few more places (from Gordon Ross, cf. sun3/dev/zs.c).

Implement zstty().

Undo accidental change.

Move CHAN_[AB] into here, and prefix with ZS_.

zsreg.h --> z8530.h

Better 4/100 support.

Integrate changes from Chuck Cranor for the Sun 4/100.
Support for multiple register banks on SBUS devices (based on patches
from Francis Dupont).
Highlights:
	romaux defines an array of register spaces.
	pay attention to `vactype'.
	quirks handling 4/100 idiosyncracies.

TIOC[SC]DTR ioctls.

TIOC[SG]FLAGS from matthew green

i hate ttyX-ignore-cd, but leave it here for a while longer

XXmatch change (and a few __P() as well)

copyright/Id cleanup

Don't mess with device if it was opened while we napped.

ioctl u_long cmd; and KNF

mapiodev takes a bustype argument now

sun4/300 support works

sbus/* --> dev/*
deal with multiple bus types (start of vme/obio support)

sun4 needs software delays for register accesses

from trunk.

make X11R5 compile easier

sun4c -> SUN4C

cast to make compiler happy.

t_stop has been erradicated

TIOCSBRK/TIOCCBRK

timeout and ndflush casts

DDB support

ioctl takes a proc *

 fixups for dynamic tty allocation:
cdevsw[]->d_ttys must be initialized
XXstop() functions must be callable from cdevsw[]->d_stop
the console tty is used before vm system is up, and must
allocate it's own clists..

cons.c, zs.c: tty->t_stop doesn't exist here. I think it goes through d_stop
	automatically now, but have not checked.
	l_ioctl() has no last parameter 'p'
fb.c: move sys/fbio.h to machine/fbio.h
various: typecast parms for timeout() properly
zs.c: extra level of indir in cdevsw[]->d_ttys

Chris Torek's sparc port. Missing lots of things.