CVS log for src/sys/arch/macppc/dev/snapper.c

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

Request diff between arbitrary revisions

Keyword substitution: kv
Default branch: MAIN

Remove unnecessary <sys/malloc.h>.

Output is always 16bit, the internal audio data type may differ.

check platform-do-*-mute properties to find out the resp. GPIO's polarity
now this works properly on pmac7,3

Revert previous, the mask is intented to be like sc_output_mask, a bitmask
of active ports.

In SNAPPER_OUTPUT_SELECT the "mask" is a bitmap of muted outputs, not
active outputs.

Recognize the OF labels used for line output and headphone output on a
G5 powermac 7,3.

Merge thorpej-cfargs2.

Adapt to CFARGS().

Sync with HEAD.

port-macppc/56289: kernel spinout on macppc when runing ATF tests with LOCKDEBUG

Move call to snapper_set_rate from trigger_output to commit_settings,
since the intr lock is not held when calling the latter.

Sync with HEAD.

snapper carries multiple interface attributes, so be explicit about
"onewirebus" when attaching to it.

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?).

Sync with HEAD.

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.

add basic support for iMac G5 audio:
- match AOAShasta
- deal with headphone gpios labeled as lineout in OF
- set sc_mode to SNAPPER_IS_PCM3052 - OF makes it look like an unlabeled
  TAS3004
TODO:
- actually support pcm3052 instead of treating it like a sw codec

Convert to intr_establish_xname().

add support for the onewire bus found in some macs, namely Quicksilver.
This can be used to read the EEPROM content from Apple Pro speakers, or to
hook up other onewire devices.

Sync with HEAD

Mostly merge changes from HEAD upto 20200411

don't try to read a 32bit property into a uint8_t.
Now headphone detection works properly on machines which have the gpio's
polarity reversed, like Quicksilver and TiBook.

various minor fixes and updates:
- add (very) basic ONYX support. Treat as 16bit codec with software volume
  control. Makes basic audio work on PCIe G5
- correctly detect TAS3001 without 'compatible' property, now this works on
  Quicksilver
- mute line input on TAS3001 - it's unconnected on Quicksilver and causes noise
- make more of an effort to match codecs to i2sbus instances, needed on G5 and
  some other models with software 'modems'

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.

switch the default input to line in, to avoid feedback noise on laptops
should probably just mute the input, I need to read the datasheet again...

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

Adapt to audio2.
- New audio filter can access softc so it's simple.
- Clear rval of fixphase on halt.

Use C99 style struct initializer to audio_format.

Use C99 style struct initializer to audio_hw_if.

Sync with HEAD

Resolve a couple of conflicts (result of the uimin/uimax changes)

Rename min/max -> uimin/uimax for better honesty.

These functions are defined on unsigned int.  The generic name
min/max should not silently truncate to 32 bits on 64-bit systems.
This is purely a name change -- no functional change intended.

HOWEVER!  Some subsystems have

	#define min(a, b)	((a) < (b) ? (a) : (b))
	#define max(a, b)	((a) > (b) ? (a) : (b))

even though our standard name for that is MIN/MAX.  Although these
may invite multiple evaluation bugs, these do _not_ cause integer
truncation.

To avoid `fixing' these cases, I first changed the name in libkern,
and then compile-tested every file where min/max occurred in order to
confirm that it failed -- and thus confirm that nothing shadowed
min/max -- before changing it.

I have left a handful of bootloaders that are too annoying to
compile-test, and some dead code:

cobalt ews4800mips hp300 hppa ia64 luna68k vax
acorn32/if_ie.c (not included in any kernels)
macppc/if_gm.c (superseded by gem(4))

It should be easy to fix the fallout once identified -- this way of
doing things fails safe, and the goal here, after all, is to _avoid_
silent integer truncations, not introduce them.

Maybe one day we can reintroduce min/max as type-generic things that
never silently truncate.  But we should avoid doing that for a while,
so that existing code has a chance to be detected by the compiler for
conversion to uimin/uimax without changing the semantics until we can
properly audit it all.  (Who knows, maybe in some cases integer
truncation is actually intended!)

Sync with HEAD

use obio_space_map() to map DMA registers, now this works on both G5 and
32bit hardware

Resolve conflicts between branch and HEAD

explicitly enable the i2s part in the keylargo FCR
now this works on my PCI-X G5

deal with PowerMac7,* mac-io/i2s/sound reg properties
now we map the right registers on G5 and get DMA interrupts. Still no sound
but - well - progress

don't poke GPIOs directly, use obio_*() access functions, now this
has a chance of working on G5 where we can't just BAT-map everything with
paddr == busaddr.
Doesn't play audio yet but things like headphone detection work.

Pull up following revision(s) (requested by sevan in ticket #1522):
	sys/arch/macppc/dev/snapper.c: 1.42
Fix issue with audio being downpitched, thanks to <nat>
"it seems that snapper_init should be called before audio_attach_mi, as
snapper
init is setting the rate to 44100 after the hardware format has been
configured
by audio_attach_mi.
audio_attach_mi should be the last thing called during an attach of an audio
device so the audio device is ready to be configured when audio_attach_mi is
called."
Resolves PR port-macppc/52949

Pull up following revision(s) (requested by sevan in ticket #1559):
	sys/arch/macppc/dev/snapper.c: 1.42
Fix issue with audio being downpitched, thanks to <nat>
"it seems that snapper_init should be called before audio_attach_mi, as
snapper
init is setting the rate to 44100 after the hardware format has been
configured
by audio_attach_mi.
audio_attach_mi should be the last thing called during an attach of an audio
device so the audio device is ready to be configured when audio_attach_mi is
called."
Resolves PR port-macppc/52949

Pull up following revision(s) (requested by sevan in ticket #520):
	sys/arch/macppc/dev/snapper.c: revision 1.42
Fix issue with audio being downpitched, thanks to <nat>
"it seems that snapper_init should be called before audio_attach_mi, as
snapper
init is setting the rate to 44100 after the hardware format has been
configured
by audio_attach_mi.
audio_attach_mi should be the last thing called during an attach of an audio
device so the audio device is ready to be configured when audio_attach_mi is
called."
Resolves PR port-macppc/52949

remove some leftover references to ki2c in comments
no functional change

Fix issue with audio being downpitched, thanks to <nat>

"it seems that snapper_init should be called before audio_attach_mi, as snapper
init is setting the rate to 44100 after the hardware format has been configured
by audio_attach_mi.

audio_attach_mi should be the last thing called during an attach of an audio
device so the audio device is ready to be configured when audio_attach_mi is
called."

Resolves PR port-macppc/52949

update from HEAD

Sync with HEAD

Sync with HEAD

Sync with HEAD

 Remove extra 0x. This bug was added when replacing bitmask_snprintf(9) with
snprintb(3) (in between NetBSD 5 and 6). Old bitmask_snprint(9) didn't add
0x" automatically for hexadecimal value, so old code used it with "0x%s".

Sync with HEAD

Sync with HEAD

adjust to dbdma changes

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

remove various set-but-unused variables.

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

convert snapper
code from mrg, tested on my iBook G4

sync with head

Get the dma registers from the soundbus property. This should work with all
snapper-compatible hardware.
Tested on PowerBook G4, MacMini and iBook G4. Failed on the PowerBook before.

Sync with HEAD (-D20101022).

Find all GPIOs in OF also on newer PowerBooks.
Do not use a GPIO or establish an interrupt when it was not found.
To be done: We should use bus_space(9) for reading/writing GPIOs.

sync with head

get rid of custom PMF event handlers, instead do what the upper layer expects
so volume control via PMF still works

sync with head

In awacs(4) and snapper(4), use deviter(9) instead of accessing
alldevs directly.

In pbms(4), delete some unused debugging macros, expand USB
compatibility macros, and add a child-detachment routine.  Simplify
pbms(4) deactivation and detachment.

These changes are compile-tested, only.

Sync with HEAD.

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

sync with head.

Sync with HEAD.

bzero -> memset

Sync with HEAD.

Sync with HEAD.

replace bitmask_snprintf(9) with snprintb(3)

Sync with HEAD.

Sync with HEAD.

Sync with HEAD.

use access functions to mess with obio's registers

use min(255, blah) to cap volume instead of masking the upper bits out

pullup the following revisions, requested my macallan in ticket 616:
	sys/arch/macppc/dev/snapper.c		1.14-1.21
- proper support for 24bit audio on TAS3004 / snapper codecs
- fix sample rate setup bugs ( otherwise the chip would always stay in
  44.1kHz )
- add support for the codecs found in G4 Mac Minis ( AOAKeylargo and
  AOAK2 ), which don't have hardware volume control
- add support for 'tumbler' codecs found in some iBook G3 models

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

Sync with HEAD.

sync with head.

sprinkle static

listen to PMF volume control events
With this volume vontrol via keyboard works on my iBook G4.

struct device -> device_t

Sync with HEAD.

Sync with HEAD.

sync with head.

Sync with HEAD

Sync with HEAD.

sync with -HEAD

Convert macppc to shared ofw_autoconf.c.  Compile tested only.

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.

cleanup, various fixes and TAS3001 / Tumbler support
from Marco Trillo in PR37076

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.

struct cfattach -> CFATTACH_DECL; compiles again.

use CFATTACH_DECL()

sync with HEAD

add support for the "tumbler" as found at least on iBook G3/600.
quick OK macallan@

sync with head.

don't bus_space_map(PAGE_SIZE) - use the actual length OF tells us instead
We need this since the new, shared bus_space_* stuff actually keeps track of
what ranges are mapped

Sync with head.

Convert macppc to powerpc bus_space.  Lots of work here from Matt Thomas,
as well as the common ofwoea code from myself.  Compile tested only,
still probably needs some fine tuning.

Also in this commit:
Convert macppc to new shared ofwoea routines.
Lots of KNF.

sync with head.

Sync with head.

Simplify sw volume control, attach to AOAK2 as well, make mono work as
well as stereo, and print a friendlier message when we don't find a
hardware mixer.

In the AOAKeylargo case, there is no hardware volume control. Instead,
implement volume control in software via audio filter framework.

XXX: audio filter framework doesn't let me pass parameters from the hw
     softc to the filter, so the volume variables are globals for now.

Match AOAKeylargo, and don't make finding deq a requirement. Sound now
comes out of my last gen G4 Mac Mini, minus mixer controls. ok macallan@

Pullup to -current

fix typo

Sync with HEAD.

TRUE -> true, FALSE -> false

Sync with head.

sync with head.

sync with head.

don't pretend to support 8kHz since the chip really doesn't
noticed by Marco Trillo

actually change the sample rate when asked to.
Fix provided by Marco Trillo in PR35204
While there also enable 24bit I/O.

Sync with head.

sync with head

Don't use // for comments.

sync with head

sync with head.

use gain table for master volume as well

fix some KNF nits

Add audio input support. From Magnus Henoch, fixes PR 32664

sync with head.

Sync with head.

sync with head.

Use device_parent().

bare asm -> __asm

merge ktrace-lwp.

Sync with HEAD. Here we go again...

- don't call ki2c private functions anymore, use iic_exec() to be a good i2c citizen
- use the deq driver to find the mixer device
- add controls for bass and treble

sync with -current

sync with head.

Sync with HEAD.

Ensure i/o commands are allocated on 16-byte boundary by allocating 15
extra bytes and adjusting array starts.
Issue pointed out on port-macppc by Michael Lorenz.

Also remove extra print of the device name on attach().

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

Sync with HEAD.

constify audio_hw_if, midi_hw_if, and radio_hw_if.

Fix the sync with head I botched.

Sync with HEAD.

Sync with HEAD

file snapper.c was added on branch ktrace-lwp on 2004-08-03 10:37:21 +0000

add support for the Keywest I2C and snapper audio device, as found on
some iBook and PowerBook models.

this driver was written by Tsubai Masanari and further hacked on by
Jared D. McNeill to work on his iBook.

the driver is limited (master volume control only, and I haven't
tested recording) but has been functioning perfectly on my PowerBook
g4 DVI (ivory) for some time.

ok'd by matt.