CVS log for src/sys/dev/pci/eap.c

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

Request diff between arbitrary revisions

Keyword substitution: kv
Default branch: MAIN

Pull up following revision(s) (requested by nia in ticket #1843):

	sys/dev/pci/eap.c: revision 1.103

eap(4): Restore the full set of supported hardware encodings from netbsd-7

Tested in QEMU.

Pull up following revision(s) (requested by nia in ticket #697):

	sys/dev/pci/eap.c: revision 1.103

eap(4): Restore the full set of supported hardware encodings from netbsd-7

Tested in QEMU.

eap(4): Restore the full set of supported hardware encodings from netbsd-7

Tested in QEMU.

Mostly merge changes from HEAD upto 20200411

 Make register address unsigned to avoid undefined behavior. Found by KUBSan.

Sync with HEAD

Clean get_props().
- Make get_props() return AUDIO_PROP_{PLAYBACK,CAPTURE} properly.
  This eliminates need for audio.c to take care of such (old)
  drivers which don't return both of PLAYBACK and CAPTURE.
- All get_props() doesn't need to return AUDIO_PROP_MMAP.
  It is handled in the audio layer now.

Merge isaki-audio2 branch, the overhaul of audio subsystem.
- Interrupt-oriented system rather than thread-oriented.
- Improve stability, quality and performance.
- Split playback and record cleanly.  Improve halfduplex support.
- Many bugs are fixed including deadlocks, resource leaks, abuses, etc.
- Simplify audio filter mechanism.  The encoding/channels/frequency
  conversions are completely handled in the upper layer.  So the hard-
  ware driver only converts its hardware encoding (if necessary).
- audio_hw_if changes:
  - Obsoletes query_encoding and add query_format instead.
  - Obsoletes set_params and add set_format instead.
  - Remove drain, setfd, mappage.
  - The call sequences are changed.
- ioctl AUDIO_GETFD/SETFD, AUDIO_GETCHAN/SETCHAN are obsoleted.
- ioctl AUDIO_{QUERY,GET,SET}FORMAT are introduced.
- cleanup config attributes: au*conv and mulaw.
- All hardware drivers should follow it (I've done as much as possible).

Some file paths are changed:
- dev/audio.c         -> dev/audio/audio.c (rewritten)
- dev/audiovar.h      -> dev/audio/audiovar.h
- dev/audio_dai.h     -> dev/audio/audio_dai.h
- dev/audio_if.h      -> dev/audio/audio_if.h
- dev/audiobell.c     -> dev/audio/audiobell.c
- dev/audiobellvar.h  -> dev/audio/audiobellvar.h
- dev/mulaw.[ch]      -> dev/audio/mulaw.[ch] + dev/audio/alaw.c

Move dev/audio_if.h -> dev/audio/audio_if.h

More adapt to audio2.
- Use set_format.
- Remove an empty method.
- XXX DAC1 and secondary audio device support should be removed.
  Now mixing two (or more) sources is done by audio layer.

Adapt to audio2.
- Drop INDEPENDENT property from es1370 which has only one clock.

Use C99 style struct initializer to audio_format.

Use C99 style struct initializer to audio_hw_if.

Sync with HEAD, resolve a few conflicts

use pci_intr_establish_xname() everywhere

update from HEAD

Sync with HEAD

remove checks for failure after memory allocation calls that cannot fail:

  kmem_alloc() with KM_SLEEP
  kmem_zalloc() with KM_SLEEP
  percpu_alloc()
  pserialize_create()
  psref_class_create()

all of these paths include an assertion that the allocation has not failed,
so callers should not assert that again.

Sync with HEAD

KNF. Remove extra spaces. No functional change.

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 pci_intr_string and eisa_intr_string take a buffer and a length
instead of relying in local static storage.

sync with head

put back IPL_AUDIO and splaudio(), at the request of rmind.  they are
aliases and now we can easily revert audio to IPL_VM if necessary,
without having to revert the whole branch.

Merge jmcneill-audiomp3 branch, which is derived from ad-audiomp2. From
the original ad-audiomp branch notes:

  Add MP locking to the audio drivers.

  Making the audio drivers MP safe is necessary before efforts
  can be made to make the VM system MP safe.

  The are two locks per device instance, an ISR lock and
  a character device lock. The ISR lock replaces calls to
  splaudio()/splx(), and will be held across calls to device
  methods which were called at splaudio() before (e.g.
  trigger_output). The character device lock is held across
  calls to nearly all of the methods, excluding some only
  used for initialization, e.g. get_locks.

Welcome to 5.99.57.

get rid of unused 'powerstate' callback in audio_hw_if

port ad-audiomp2 branch changes to 5.99.56
todo:
 - port ad-audiomp2 pcppi changes
 - these drivers need to be fixed:
   - emuxki
   - gcscaudio
   - hdafg
   - uaudio
   - umidi
   - MD audio drivers

Checkpoint work in progress.

Checkpoint work in progress.

Checkpoint work on MIDI.

Death to NOWAIT.

Ressurect the ad-audiomp branch at request of matt@.

With this commit:

- core audio subsystem made MPSAFE
- eap, btsco drivers made MPSAFE

TODO:

- midi
- convert remaining drivers

Sync with HEAD.

sync with head.

sync with head.

Remove clause 3 and 4 from TNF licenses

Sync with HEAD.

sync with head.

sync with HEAD

sync with head.

Split device_t/softc, and other related cosmetic changes.

sync with HEAD

sync with head.

Sync with HEAD.

Follow the merge of pmap.c on i386 and amd64 and move
pmap_init_tmp_pgtbl into arch/x86/x86/pmap.c. Modify the ACPI wakeup
code to restore CR4 before jumping back into kernel space as the large
page option might cover that.

Sync with HEAD.

Sync with head.

machine/{bus,cpu,intr}.h -> sys/{bus,cpu,intr}.h

sync with head.

Sync with HEAD.

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

Add MP locking for audio drivers.

sync with head.

sync with head.

Sync with head.

__unused removal on arguments; approved by core.

sync with head

- sprinkle __unused on function decls.
- fix a couple of unused bugs
- no more -Wno-unused for i386

sync with head

sync with head.

fix incomplete initializers

sync with head

Merge from HEAD.

Correct build failures when MIDI is not enabled (the idea!).

Specifically eap but no midi, which makes sense if you want sound,
and umidi but no midi, which makes little sense but shouldn't fail the
build.

Suggest changing the evbarm conf files containing umidi but #midi
to comment out umidi as well (even though this fix should let them build).

Ankh-Morpork, we have a MIDI driver....

Merge from chap-midi branch, after
~month for review
Comments by thorpej@ drochner@ and Alexandre Ratchov

Incorporated: points by thorpej@ drochner@; preliminary support for
a stats-collecting ioctl suggested by martin@ from comments by A.R.

PR kern/32441 kern/32442 kern/32567 kern/32588 kern/32694 kern/33590
kern/33614 and one instance of kern/32651

ok martin@

sync with head.

sync with head.

Sync with head.

Updates PR kern/32651

The eap driver now makes use of the MIDI UART tx interrupt available on
the Ensoniq chips.  A test with nominally 20 seconds of continuous transmit
data went from 26 s real / 25 s system to 22 s real / 0.16 s system.
Implementation is quite simple, and anyone who knows any of the other
MIDI UART chips well enough to get a tx interrupt out of it would do a
world of good by updating their drivers similarly.

Anyway, scratch one off the kern/32651 todo list.

Also added a documentation reference to the ES1373 datasheet, and added
more 1371- and 1373-specific #defines in eapreg.h.  Enough there now that
anyone who wanted to play with the S/PDIF capability on the 1373 could
begin to do that.

Initialize the mixer delta value to 8 for the 1370 version. No
objections in tech-kern.

KNF.

Remove leading __ from __(const|inline|signed|volatile) -- it is obsolete.

merge ktrace-lwp.

Sync with HEAD. Here we go again...

Use ANSI function decls and static.

sync with -current

sync with head.  xen and whitespace.  xen part is not finished.

Sync with HEAD.

Hi Perry!

nuke trailing whitespace

Sync with HEAD.

"output.source" on the Ensoniq 1371 really should be "input.source". Making
it so lets the audio(4) interface -- play.port and play.gain -- attach
properly.  Analysis and patch provided by Joachim Kuebart in PR kern/29178.

Sync with HEAD.

ansify and KNF

merge kent-audio1 branch, which introduces audio filter pipeline to the MI
audio framework


Summary of changes:

* struct audio_params
  - remove sw_code, factor, factor_denom, hw_sample_rate,
hw_encoding ,hw_precision, and hw_channels.  Conversion information
is conveyed by stream_filter_list_t.
  - change the type of sample_rate: u_long -> u_int
  - add `validbits,' which represents the valid data size in
precision bits.  It is required in order to distinguish 24/32bit
from 24/24bit or 32/32bit.

* audio_hw_if
 - add two parameters to set_params()
	stream_filter_list_t *pfil, stream_filter_list *rfil
   A HW driver should set filter recipes for requested formats
 - constify audio_params parameters of trigger_output() and
trigger_input().  They represent audio formats for the hardware.
 - make open() and close() optional
 - add int (AUMODE_PLAY or AUMODE_RECORD) and audio_params_t parameters
 to round_blocksize()

* sw_code is replaced with stream_filter_t.
  stream_filer_t converts audio data in an input buffer and writes
into another output buffer unlike sw_code, which converts data in
single buffer.
  converters in dev/auconv.c, dev/mulaw.c, dev/aurateconv.c,
dev/tc/bba.c, dev/ic/msm6258.c, and arch/arm/iomd/vidcaudio.c are
reimplemented as stream_filter_t

* MI audio
 - audiosetinfo() builds filter pipelines from stream_filter_list_t
filled by audio_hw_if::set_params()
 - audiosetinfo() returns with EINVAL if mmapped and set_params()
requests filters
 - audio_write(), audio_pint(), and audio_rint() invoke a filter
pipeline.
 - ioctl() for FIONREAD, AUDIO_WSEEK, AUDIO_GETIOFFS,
AUDIO_GETOOFFS, and audio_prinfo::{seek,samples} for
AUDIO_GETINFO handle values for a buffer nearest to userland.

* add `struct device *' parameter to ac97_attach()

* all of audio HW drivers follow audio_hw_if and ac97 changes

audio_hw_if change
 * make open() and close() optional
 * add int (AUMODE_PLAY or AUMODE_RECORD) and audio_params_t parameters
 to round_blocksize()

* adopt the filter pipeline framework
* follow ac97_attach() change

Sync with HEAD.

remove mixer setting code in *_attach() because ac97_attach() does it.

Sync with HEAD.

constify audio_hw_if, midi_hw_if, and radio_hw_if.

Sync with HEAD.

Pullup rev 1.72 (requested by kent in ticket #867)

ac97_host_if::reset() returns non-zero value if codec reset fails, and
ac97 is not attached in that case. PR#26973

ac97_host_if::reset() returns non-zero value if codec reset fails, and
ac97 is not attached in that case.

PR: kern/26973

Fix the sync with head I botched.

Sync with HEAD.

Sync with HEAD.

Check return values of config_detach() for child devices and abort
our own detach() on errors.

Sync with HEAD

Clean up.  Attempt to make these safer against stray interrupts.

support the game port on eap1371
This is only usable with some caution because these soundcards only
allow to map IO port 0x20x for this, thus bypassing PCI address
management. Very likely this will only work on primary PCI buses, and there
is some potential for conflicts with ISA devices as well.
(XXX cannot be detached because the "joy" driver doesn't support it yet)

pass string length (= boundary info) to pci_devinfo so that we do not run over
the end of memory region

netbsd.org -> NetBSD.org

This was the last commit of this kind to src/sys, which is now totally
"NetBSD.org clean".  Thanks for the patiance, and sorry for all the commits.

DMA, not dma nor Dma.

Add extensible malloc types, adapted from FreeBSD.  This turns
malloc types into a structure, a pointer to which is passed around,
instead of an int constant.  Allow the limit to be adjusted when the
malloc type is defined, or with a function call, as suggested by
Jonathan Stone.

Use aprint_*().

Sync with HEAD.

add detach support

Sync with HEAD.

For the ES1370 do "best effort" rate selection for the FM DAC. The
card contains only one clock, which is already used by the other
DAC. The FM DAC can handle a few fixed-frequency choices.

thanks to Matthew Green for testing

Sync with HEAD.

Pull up revision 1.59 (requested by pooka in ticket #1035):
  Don't use tsleep() in attach, use delay().  Makes the driver
  work properly with ``Ensoniq CT5880''-based audio card.

Silly me for assuming that the CT5880 cards could be identified by looking
at which ones had the Product ID CT5880. Try to get the checks right now.

Also add ES1373_8 to the list.

Sync with HEAD.

Recognize a few more CT5880 chips. Only cosmetic, does not
affect functionality.

Don't use tsleep() in attach, use delay()

This change makes the driver work properly for the following card,
which used to function a bit weird:

eap0 at pci0 dev 10 function 0: Ensoniq CT5880 CT5880C (rev. 0x02)
eap0: interrupting at irq 9
eap0: TriTech TR28602 codec; no 3D stereo

Fix uninitialised variable warnings.

eap.c 1.54 changed ES1371 specific code but failed to make the
corresponding cases to the ES1370 case, causing a panic when
attaching an ES1370.

rename EAP_EN() to the more descriptive EAP_DAC_EN(), and
use it everywhere.

Catch up to -current

Don't use newlines in string literals.

add support for the second DAC found on the chip. to attach the second
audio device, define EAP_USE_BOTH_DACS

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

make a few debug printf's match reality

Add trailing ; to CFATTACH_DECL.

Use CFATTACH_DECL().

Declare all cfattach structures const.

sync kqueue branch with HEAD

Catch up to -current.

catch up with -current.

Mask MCCB interrupts since they are not currently handled
and it is not clear how they should be handled.  Fixes
kern/17071.

Sync kqueue branch with -current.

Catch up to -current.

add RCSID

Catch up with -current. Fix some bogons in the sparc64 kbd/ms
attach code. cd18xx conversion provided by mrg.

Catch up to -current.

Add a new optional method, dev_ioctl, to the audio hardware driver interface.
It is called when an unrecognized ioctl() is performed on a device,
thus allowing ioctl()s that frob the hardware driver (like loading
microcode).

Catch up to -current.

Update the kqueue branch to HEAD.

Fixed compiling error when AUDIO_DEBUG was switched on ...

Catch up to -current.

Pull up revision 1.45 (requested by hubertf):
  Work around race condition by relatching the interrupt.  Makes
  the eap driver not hang on certain occasions.

It appears there's a race condition when disabling a channel that causes us to
need to explicitly relatch the interrupt when firing it up again.  So, in the
trigger routines, explicitly disable and reenable the interrupt to relatch it,
like we do in the interrupt routine.

Also clean up some broken loop overrun checks.

My ES1371 seems to be more reliable now, but I'm not going to pretend to fully
understand this chip.

Sync with HEAD.

ANSIfy.

Sleep a little when closing the midi device to allow the UART to drain.

Sync with HEAD

Change pci_intr_map to get interrupt source information from a "struct
pci_attach_args *" instead of from four separate parameters which in
all cases were extracted from the same "struct pci_attach_args".

This both simplifies the driver api, and allows for alternate PCI
interrupt mapping schemes, such as one using the tables described in
the Intel Multiprocessor Spec which describe interrupt wirings for
devices behind pci-pci bridges based on the device's location rather
the bridge's location.

Tested on alpha and i386; welcome to 1.5Q

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 mmap paddr_t/off_t changes from trunk.

Change the kernel mmap interface so that the offset to map is an
"off_t" and the return value is a "paddr_t" to allow mappings
at offsets past 2^31 bytes.  Somewhat inspired by FreeBSD, which
only changed the offset to a "vm_offset_t".

Includes updates for the i386, pc532 and sh3 mmmmap from Jason Thorpe.

Sync w/ netbsd-1-5-base.

Update URLs.

ac97.h -> ac97var.h

Change the way the codec is access to mimic how Linux&FreeBSD does it.

Add driver for C-Media CMI8x38 Audio Chip. From Takuya SHIOZAKI <AoiMoe@imou.to>

Move a test if the MIDI is open outside a loop in the interrupt routine.
Some stylistic changes.

Make it a bit more clear which functions are specific to which models.
Split off register definitions into eapreg.h.
Remove duplicate codec reset.

The shortened 1371 reset delay in revision 1.32 doesn't seem to be
quite enough for my 1373, so increase it some.

Make Creative Soundblaster PCI 128's work -- from Masahiro Ishiyama
Note that on device close, there's a sharp pop that probably should be fixed.

Note also that the device is hanging the machine at times for brief
periods inside audio.c::audiogetinfo(), but I haven't yet figured out
why.

Pull up to last week's -current.

Sync with -current

Shorten some delay()s.  From WITEK Wnuk <witek@atari.org>

Fix crash when both 1370 and 1371/1373 devices are configured.
Update documentation links.
XXX The initial volume of the 1371 mixers is set to 255. Should be ~200.

Make little endian and big endian version of all functions
that deal with 16 bit samples.  Let the drivers decide which ones
to use.

Add MIDI support.
Closes PR 8578.

Add support for ES1371.  From OpenBSD and Ezra Story <ezy@panix.com>.

Don't make a human-readable device description being printed at attach time
depend on PCIVERBOSE.

Update from trunk.

Fix a buglet in the driver's DMA buffer list ipmlementation, causing the next-
in-list (wrong) descriptor structure of the buffer in question to be freed.

Pass the correct address (PCI bus address, not PA) to the card.
Works on an Alpha now.

Minor code munging.

Fix a silly type.

Update comments.

Pass the direction to the allocm and round_buffersize methods.
Some drivers need this to properly allocate DMAable memory.

Fix more `void *' arithmetic.

Make the copyright header conform to the NetBSD template.

fix problems in many d_mmap routines:
	- returned EOPNOTSUPP rather than -1.
	- no check for negative offset.
many of these fix potential security problems in these drivers.


XXX XXX XXX
the d_mmap cdev routine should be changed to have a prototype like:
	paddr_t (*d_mmap) __P((dev_t, off_t, int));

by someone!

Add some braces to make egcs happy.

* Redo the way the way the MIDI driver attaches to audio devices.
* Improve the midisyn layer a little.
* Add a driver for the Yamaha OPL[23] FM synths.
  The opl driver is not finished yet; it sounds pretty awful.

For some strange reason I cannot get any FM sound from my SB64 cards,
but a regular SB16 works fine.

Make copyright notices with my name consistent.

Associate the preamp with the mic volume in the input class.

Oops; fix typos.

Add a knob to enable/disable the mic preamp.

For consistency, only do the rate coupling in full-duplex mode.

Minor cleanup to debugging cruft.

Several things:
* Use the new trigger_{in,out}put interface.
* Allow the play and record channels to have different encodings (but the
  same sample rate).
* Play u-law and a-law as 16-bit data.  (This may not work yet...)

Add mixer output selection.
From gson@araneus.fi (Andreas Gustafsson)

Nuke __BROKEN_INDIRECT_CONFIG.

Fix a recording problem that occurs when the EAP chip sends its
interrupt just BEFORE the dma has finished rather than after.

Remove some lint.

Adjust PCLKDIV by 2 to correct the output sample rate.  (Unfortunately, this
isn't documented.)
Fix typo in mappage routine.

Oops; fix typo.

Fix reading of the master volume, and a hack that seems to make stereo output
work correctly.  (Will check the documentation as soon as I can read it.)

Add a driver for the Ensoniq AudioPCI sound card.  The driver still
needs some testing, but it seems to produce sound.  The driver was written
by me, but since I don't have the hardware the debugging and testing was
done by Andreas Gustafsson <gson@araneus.fi>, Chuck Cranor
<chuck@maria.wustl.edu>, and Phil Nelson <phil@cs.wwu.edu>.  Thanks.