CVS log for src/sys/dev/ic/ac97.c

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

Request diff between arbitrary revisions

Keyword substitution: kv
Default branch: MAIN

Fix undefined behaviors found by kUBSan.
Tested on VirtualBox with amd64 kernel.

Merge changes from current as of 20200406

Use NULL for pointer.

Sync with HEAD

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

update from HEAD

Sync with HEAD

Pull up following revision(s) (requested by nat in ticket #1460):
	sys/dev/auconv.c: revision 1.30 via patch
	sys/dev/ic/ac97.c: revision 1.97 via patch
	sys/dev/pci/azalia_codec.c: revision 1.81 via patch
Mixer device bounds checking.
Analysis by Ilja van Sprundel.

Pull up following revision(s) (requested by nat in ticket #1460):
	sys/dev/auconv.c: revision 1.30 via patch
	sys/dev/ic/ac97.c: revision 1.97 via patch
	sys/dev/pci/azalia_codec.c: revision 1.81 via patch
Mixer device bounds checking.
Analysis by Ilja van Sprundel.

Pull up following revision(s) (requested by nat in ticket #1460):
	sys/dev/auconv.c: revision 1.30 via patch
	sys/dev/ic/ac97.c: revision 1.97 via patch
	sys/dev/pci/azalia_codec.c: revision 1.81 via patch
Mixer device bounds checking.
Analysis by Ilja van Sprundel.

Pull up following revision(s) (requested by nat in ticket #166):
	sys/dev/auconv.c: revision 1.30
	sys/dev/audio.c: revision 1.372
	sys/dev/ic/ac97.c: revision 1.97
	sys/dev/pci/azalia_codec.c: revision 1.81
Mixer device bounds checking.
Analysis by Ilja van Sprundel.

Mixer device bounds checking.

Analysis by Ilja van Sprundel.

Pull up following revision(s) (requested by maxv in ticket #858):
	sys/dev/ic/ac97.c: revision 1.96
fix memory leak, found by Brainy.
XXX: is there anything else that we need to cleanup at this point?

Sync with HEAD

fix memory leak, found by Brainy.
XXX: is there anything else that we need to cleanup at this point?

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.

Add some pre-processor magic to verify that the type of the data item
  passed to sysctl_createv() actually matches the declared type for
  the item itself.
In the places where the caller specifies a function and a structure
  address (typically the 'softc') an explicit (void *) cast is now needed.
Fixes bugs in sys/dev/acpi/asus_acpi.c sys/dev/bluetooth/bcsp.c
  sys/kern/vfs_bio.c sys/miscfs/syncfs/sync_subr.c and setting
  AcpiGbl_EnableAmlDebugObject.
(mostly passing the address of a uint64_t when typed as CTLTYPE_INT).
I've test built quite a few kernels, but there may be some unfixed MD
  fallout. Most likely passing &char[] to char *.
Also add CTLFLAG_UNSIGNED for unsiged decimals - not set yet.

sync with head

Add the Avance Logic ALC203 code, found on e.g. alix3d3 boards.

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.

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

Sync with HEAD.

sync with head.

Support UCB1400.
  It tested on GUMSTIX with audiostix.  However GUMSTIX needs more ad-hoc patch.

sync with head

Sync with HEAD.

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

struct device * -> device_t, no functional changes intended.

sync with head.

Sync with HEAD.

Sync with HEAD.

replace bitmask_snprintf(9) with snprintb(3)

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 wrstuden-revivesa-base-2.

Sync with HEAD.

Sync with head.

Array range designated initializers are a gcc extension.  Replace with
explicit initialization with zeros, although it probably isn't necessary.

Sync with HEAD.

use aprint_*_dev and device_xname

- sync with head.
- move sched_changepri back to kern_synch.c as it doesn't know PPQ anymore.

Add MP locking for audio drivers.

sync with head.

Replace the Mach-derived boolean_t type with the C99 bool type.  A
future commit will replace use of TRUE and FALSE with true and false.

Update documentation URL. Previous one was leading to a "Page not found".

sync with head.

sync with head

sync with head.

add missing initializers

implement auto-detection of volume resolutions

sync with head

add capability to support for S/PDIF.
If a codec supports for AC'97 S/PDIF, it will have an mixer "spdif.enable."
However, we can't change the value of the mixer without AC'97 host
driver's support.

sync with head.

Sync with head.

Merge 2006-05-24 NetBSD-current into the "peter-altq" branch.

sync with head.

sync with head

Update URLs to ASAHI KASEI CODECs.

Sync with head.

sync with head.

* Add a flag AC97_HOST_INVERTED_EAMP. (kern/18880, kern/24488).
* Make reset callback optional; not all devices need it. (port-i386/14260, kern/12603, kern/12723, kern/24957).

merge ktrace-lwp.

Sync with HEAD. Here we go again...

Add "Conexant CXT48". This should have a more meaningful name, but I
couldn't find it. So, I added this because it's better than printing
"unknown codec". When we find a more decent name later, we can change this.

Add SigmaTel STAC9752/53 codec ID.

Change the rest of the sysctl subsystem to use const consistently.
The __UNCONST macro is now used only where necessary and the RW macros
are gone.  Most of the changes here are consumers of the
sysctl_createv(9) interface that now takes a pair of const pointers
which used not to be.

- add missing const
- fix variable shadowing
- remove unneeded casts

Add a heuristic to test if an audio CODEC's AC97_REG_POWER register supports
the AC97_POWER_ANL bit.

The heuristic simply checks if AC97_REG_POWER's AC97_POWER_MIXER  bit can
be set, implying the CODEC can control power to its mixer. If the bit
reads back as zero after we set it, assume ANL is reserved.

Without this patch, some CODECs (e.g. Philips UCB1400) will experience long
delays during attach and resume while the driver waits for a bit which will
never set.

Thanks to jmcneill@ for reviewing this WRT AC97 modem power control.

sync with -current

* Reduce timeout for codec powerup
* Return ENXIO from ac97_attach_type if the modem codec fails to power-on.
  This will prevent broken AC97 modems *cough*Conexant*cough* from giving
  the impression that they will actually work.

Don't touch AC97_REG_RESET if we're dealing with a modem (modems use
AC97_REG_EXT_MODEM_ID instead). Also set the default audio rate to 8000;
12000 was a stupid choice since we don't actually support it in the driver
yet.

Add ac97_attach_type(), to allow the hw driver to skip probes for audio or
modem devices. ac97_attach now calls ac97_attach_type() with
AC97_CODEC_TYPE_AUDIO, for backwords compatibility.

Add identifiers for Intel ICH3 AC'97 modems and CXT33 modem codecs, from
Nicolas Joly <njoly _at_ pasteur _dot_ fr>.

AC'97 modems don't have the same mixer controls as audio devices. Treat
them differently. Mixers are built depending on the features returned
in the ext_mid -- any combination of LINE1, LINE2, and HANDSET.

* Add more AC97 modem registers (from AC'97 revision 2.2)
* Add sysctls to control the modem's off-hook status (work in progress)

* Add support for skipping either the modem or audio AC'97 probes
  via host_flags: AC97_HOST_SKIP_AUDIO, AC97_HOST_SKIP_MODEM
* If we're dealing with a modem codec, print the extended modem
  capabilities.
* Add basic AC'97 modem initialization support.
* Add some (but not all) AC'97 modem registers. More will be added later.

Sync with HEAD.

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

unify to uintXX_t

* add "struct device *" parameter to ac97_attach() as discussion in tech-kern
* change the type of sampling rate parameter of ac97_set_rate():
	u_long * -> u_int *
* other cosmetic changes

Sync with HEAD.

- nuke __P()
- add ac97_codec_if_vtbl::detach()

Sync with HEAD

make sure of readiness of an AC'97 codec by writing a value and
reading it.  There is a codec which is not operational just
after power states become ready.

PR#26457

split outputs.tone to outputs.bass and outputs.treble

from OpenBSD

Sync with HEAD.

Pullup rev 1.62 (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.

Pull up revision 1.59 (requested by kent in ticket #823):
Check power states after codec reset.  This change fixes a
resume problem on some boards.
Patch provided by Joachim Thiemann in PR kern/26457

Sync with HEAD

add debug code for ac97_write().
It is enabled by defining AC97_IO_DEBUG.

Sync with HEAD.

Use ANSI function decls and more use of static.

Check power states after codec reset.  This change fixes a
resume problem on some boards.
Patch provided by Joachim Thiemann in PR kern/26457

Pullup rev 1.54-1.58 (requested by kent in ticket #758)

Support for some AC'97 codecs

Sync with HEAD.

VT1616i support

correct the mask value for CMI9739

recognize CMI9739 codec.

AD1888 support.
PR kern/25949

recognize ALC655/658/850

Sync with HEAD

- update URLs for sigmatel.
- add entry for "SigmaTel STAC9758/59" (seen on a new emuxki card)

An ICH board needs reading AC97_REG_RESET before reading AC97_VENDOR_ID.
(why?)
http://mail-index.netbsd.org/current-users/2003/11/22/0007.html

AD1985 codec needs the same quirk as AD1980.
The patch was provided by Lars Heidieker.

Cosmetic changes
 - ANSIfy
 - no argument names in prototypes
 - variable declaration with initialization

Change the way of setting a port value so that a change too small to
fit in the number of bits used for the port still does something.

This fixes PR pkg/18741 for ac97-based hardware. Other audio drivers
might need a similar fix.

codec id for AD1985

After initialization of the AD1980 codec, swap master and surround volume
controls.  As it was before, the master volume control in all mixer programs
did nothing.  It seems that this codec is not correctly wired in (almost?)
all motherboards.

Patch by Quentin Garnier.  Fixes first part of PR kern/22548.

Correct flag names of AD1980

Codec id ADS 0x70 is AD1980, not AD1981.
http://mail-index.netbsd.org/tech-kern/2003/09/03/0005.html

Use bitmask_snprintf() for printing ext id features.

Add AD1981-specific initialization.
The patch provided by Lars Heideker.

PR: kern/20368

In ac97_restore_shadow(), make sure to restore the codec's extended
control register if we configured it during ac97_attach().

add Philips UCB1400

Use aprint_*().

Remove variable that is only assigned too but not referenced.

Sync with HEAD.

Recognize AD1981 codec (0x41445370).  XXX name is a guess but it follows
the existing pattern.

Pull up revision 1.37 (via patch, requested by kent in ticket #980):
  Fix LR reversal problem of mixer and record gain
  polarity problem.  Based on PR#12878 and PR#18901.

Catch up to -current

Fix LR contrary problem of mixer and record gain polarity
problem.  The change is based on the patches in PR kern/12878 by
Zdenek Salvet and PR kern/18901 by SUNAKAWA Hirokatsu.

Add codec IDs for AD1981B, STAC9750/51, and STAC9766/67.
Whitespace.

Correct codec id of VT1611A.
Add codec id of VT1616.

ALC650 codec specific chagne:
 Add outputs.surround.mixtofront,
 outputs.center.mixtofront, and outputs.lfe.mixtofront.

VT1616 codec specific change:
 Add outputs.surround.mixtofront,
 outputs.center.mixtofront, and outputs.lfe.mixtofront.
 (Not tested)

XXX: We should provide ac97(4) manual page and describe
codec-specific features.

Catch up to -current.

Add all vendor/codec IDs which OpenBSD has and NetBSD doesn't have.

Mixer changes:
 - Add "outputs.surround", "outputs.center", and "outputs.lfe"
 - If the codec is not capable of a feature, mixer variables
about the feature is not created.  For example, no
"outputs.tone" for a codec without tone control.
 - Set the following mixer values in ac97_attach():
	outputs.master=127,127
	outputs.master.mute=off
	outputs.headphones.mute=off
	outputs.surround=127,127
	outputs.surround.mute=off
	outputs.center=127
	outputs.center.mute=off
	outputs.lfe=127
	outputs.lfe.mute=off
	inputs.dac.mute=off
	inputs.cd.mute=off
	inputs.line.mute=off
	inputs.aux.mute=off
	inputs.video.mute=off
	record.volume.mute=off
    because the default setting of AC'97 codec (all mutes are on,
    and maximum volume) is troublesome.
 - Make "char*" parameters of ac97_get_portnum_by_name() "const char*"

Codec ID changes:
 - If a codec ID is unknown but its vendor ID is known,
ac97_attach() prints the vendor name like "dev0: <vendor name>
unknown (0xXXXXXXXX) codec;"
 - Add IDs of Asahi Kasei AK4542, AK4544, AK4544A, AK4545,
Realtek ALC100
 - Correct a vendor name: "Advance Logic" -> "Avance Logic"
 - Add capability of codec-specific initialization

ac97_attach():
 - CDAC, SDAC, and LDAC are eanabled.
 - DELAY() before mixer settings.  ThinkPad X24 needs it.

ALC650 codec specific change:
 - Add "outputs.surround.lineinjack" to switch the line-in jack
to the surround output
 - Add "outputs.center.micjack" and "outputs.lfe.micjack" (alias
of "outputs.center.micjack") to switch the mic jack to the
center/lfe output.

ac97_attach(): Restore the default rate value after VRA checking.
This change might solve PR kern/18613.

Add 'mask' member to the struct ac97_codecid.
Cirrus Logic Crystal codec uses lower three bits in ID for a
revision number.  We should mask an actual ID value before
matching to this table.

fill in name for TriTech unknown: TR28602

If the codec is fixed-rate, ac97_set_rate() returns 48kHz.

Add IDs for YMF743-S and YMF753-S.

ac97_attach(): Enable VRA/VRM if the codec is capable of them.

The struct ac97_softc keeps the clock of the codec, the basic
features flag (the value of AC97_REG_RESET), and the extended
features flag (the value of AC97_REG_EXT_AUDIO_ID).

ac97_codec_if: Add get_extcaps(), set_rate(), and set_clock()
methods.

Add some constant symbols for AC97 registers and values based on OpenBSD.
Rename some symbols to sync with OpenBSD:
	AC97_REG_EXTENDED_ID
	-> AC97_REG_EXT_AUDIO_ID
	AC97_REG_EXTENDED_STATUS
	-> AC97_REG_EXT_AUDIO_CTRL
	AC97_CODEC_DOES_VRA/AC97_ENAB_VRA
	-> AC97_EXT_AUDIO_VRA
	AC97_CODEC_DOES_MICVRA/AC97_ENAB_MICVRA
	-> AC97_EXT_AUDIO_VRM

ac97feature: "mic channel" -> "dedicated mic channel"
ac97_attach(): print extended capabilities; VRA, DRA, SPDIF, VRM, CDAC,
SDAC, LDAC.

more device names

sync kqueue branch with HEAD

Catch up to -current.

catch up with -current.

add a couple of Analog device names

Catch up to -current.

Sync w/ -current.

Pull up revision 1.24 (requested by ichiro):
  Add accidentally omitted comma.

Pull up revision 1.22 (requested by he):
  Add driver for the ESS Allegro-1 / Maestro-3 audio hardware.

It corrected forgetting to attach ","

Call malloc(9) with M_ZERO flag instead of memset() after malloc().

More catchup.

Sync kqueue branch with -current.

For cosmetic reasons, add 'ESS Technology ES1921' to the table of codec Ids.

Catch up to -current.

add/cleanup RCSID

Catch up with -current.

bcopy -> memcpy

Catch up to -current.

Pull down revision 1.19 (requested by he):
  Previous pull-up was a bit too aggressive, causing a compile
  problem.  Sorry.

Pull up revisions 1.13-1.19 (requested by skrll and he):
  Add a driver for the ESS Technology Maestro-1/2/2E AC97 audio chips,
  ES1968 and ES1978.

Set the delta for the particular source so telling mixerctl to decrease the
volume (using --) adjusts it far enough to stick.

Sync with HEAD.

constify

Sync with head (for UBC+NFS fixes, mostly).

Add new AC97_HOST_SWAPPED_CHANNELS host flag that causes left and right
mixer channels to be swapped (required for hardware that has wiring
reversed).

Sync with HEAD

Add some codecs.

Sync with HEAD.

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.

file ac97.c was added on branch thorpej_scsipi on 2000-11-20 11:40:03 +0000

Feh, fix st00p1d braino in last.

Shadow the AC'97 codec registers.  This adds two capabilities:
* support devices that crash when reading the codec registers; a flags
  interface is added to the host interface and one flag is defined
  (AC97_HOST_DONT_READ).
* new API (restore_ports) for restoring the user's settings.  This
  can be useful after an APM resume after a suspend to disk.

From OpenBSD.

Add some more codec IDs.  From OpenBSD.

Pull up rev 1.12:
> date: 2000/07/14 21:09:45;  author: soren;  state: Exp;  lines: +2 -2
> Merge-o (printf format mistake).

Merge-o.

Sync w/ netbsd-1-5-base.

Make ID printing a little more robust in case of problems reading
AC97 registers.

Move register definitions into ac97reg.h

ac97.h -> ac97var.h

Unmute some mixer controls by default.  From OpenBSD.

Recognize the Crystal CS4297A codec, and add a couple of macros
to manipulate AC97 codec IDs.

Fix an uninitialized variable.  From Krister Walfridsson <cato@df.lth.se>

Pull up to last week's -current.

Change CS4297 id entry.

Print the PnP id of unknown codecs.

Sync with -current

file ac97.c was added on branch fvdl-softdep on 1999-11-15 00:40:22 +0000

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

Clean up attachment printing a bit.

Add AC97 mixer/codec support.  From OpenBSD and FreeBSD.