[PATCH][RFC][2.6.15-rc3] snd_powermac: Add ID for Spring 2005 17" Powerbook

[PATCH][RFC][2.6.15-rc3] snd_powermac: Add ID for Spring 2005 17" Powerbook

[Kyle Moffett]

[-- Attachment #1: Type: text/plain, Size: 509 bytes --]

The audio chip in my Spring 2005 17" PowerBook was incorrectly  
recognized as an AWACS chip.  This adds the chip ID to the  
snd_powermac driver such that it is recognized as a Toonie (I don't  
know if that's correct, but it's the only one that makes it work at  
all). and sorts the ID lists numerically.  NOTE:  This chip is only  
minimally supported at this point; it has system beep support and  
very low volume speaker output, and that's about it.

Signed-off-by: Kyle Moffett <mrmacman_g4@mac.com>


[-- Attachment #2: pmacaudio.patch.txt --]
[-- Type: text/plain, Size: 732 bytes --]

--- linux-2.6.15-rc2/sound/ppc/pmac.c	2005-10-27 20:02:08.000000000 -0400
+++ linux-2.6.15-rc2-aphrodite1/sound/ppc/pmac.c	2005-11-26 02:18:40.000000000 -0500
@@ -987,11 +987,11 @@
 		 * single frequency until proper i2s control is implemented
 		 */
 		switch(layout_id) {
-		case 0x48:
-		case 0x46:
-		case 0x33:
-		case 0x29:
 		case 0x24:
+		case 0x29:
+		case 0x33:
+		case 0x46:
+		case 0x48:
 		case 0x50:
 		case 0x5c:
 			chip->num_freqs = ARRAY_SIZE(tumbler_freqs);
@@ -1000,6 +1000,7 @@
 			chip->control_mask = MASK_IEPC | 0x11;/* disable IEE */
 			break;
 		case 0x3a:
+		case 0x40:
 			chip->num_freqs = ARRAY_SIZE(tumbler_freqs);
 			chip->model = PMAC_TOONIE;
 			chip->can_byte_swap = 0; /* FIXME: check this */


[-- Attachment #3: Type: text/plain, Size: 2 bytes --]

Re: [PATCH][RFC][2.6.15-rc3] snd_powermac: Add ID for Spring 2005 17" Powerbook

[Benjamin Herrenschmidt]

On Tue, 2005-11-29 at 14:02 -0500, Kyle Moffett wrote:
> The audio chip in my Spring 2005 17" PowerBook was incorrectly  
> recognized as an AWACS chip.  This adds the chip ID to the  
> snd_powermac driver such that it is recognized as a Toonie (I don't  
> know if that's correct, but it's the only one that makes it work at  
> all). and sorts the ID lists numerically.  NOTE:  This chip is only  
> minimally supported at this point; it has system beep support and  
> very low volume speaker output, and that's about it.
> 
> Signed-off-by: Kyle Moffett <mrmacman_g4@mac.com>

It's a different chip but heh, Toonie might work very basically (Toonie
is basically a non-configurable codec).

Anyway, what is needed is a rewrite of that driver from scratch with a
more flexible architecture to deal with the multiple codecs & busses.

Ben.

Re: [PATCH][RFC][2.6.15-rc3] snd_powermac: Add ID for Spring 2005 17" Powerbook

[Kyle Moffett]

On Nov 29, 2005, at 16:09, Benjamin Herrenschmidt wrote:
> It's a different chip but heh, Toonie might work very basically  
> (Toonie is basically a non-configurable codec).
>
> Anyway, what is needed is a rewrite of that driver from scratch  
> with a more flexible architecture to deal with the multiple codecs  
> & busses.

I might have some time to tinker, is there any place I can get specs  
on the various chips from?  I know there's probably something in the  
Darwin sources, but I'm completely unfamiliar with those, so I'm  
interested in any advice you can offer.

Cheers,
Kyle Moffett

--
I have yet to see any problem, however complicated, which, when you  
looked at it in the right way, did not become still more complicated.
   -- Poul Anderson

Re: [PATCH][RFC][2.6.15-rc3] snd_powermac: Add ID for Spring 2005 17" Powerbook

[Benjamin Herrenschmidt]

On Tue, 2005-11-29 at 16:35 -0500, Kyle Moffett wrote:
> On Nov 29, 2005, at 16:09, Benjamin Herrenschmidt wrote:
> > It's a different chip but heh, Toonie might work very basically  
> > (Toonie is basically a non-configurable codec).
> >
> > Anyway, what is needed is a rewrite of that driver from scratch  
> > with a more flexible architecture to deal with the multiple codecs  
> > & busses.
> 
> I might have some time to tinker, is there any place I can get specs  
> on the various chips from?  I know there's probably something in the  
> Darwin sources, but I'm completely unfamiliar with those, so I'm  
> interested in any advice you can offer.

Bits in Darwin yes, bits on the  various vendor web sites... I actually
have specs for almost all of the chips used in the recent machines;

I strongly suggest you first spend a few days digging through Darwin
sources to fully grasp the extent of the problem though :)

Ben.

Re: [PATCH][RFC][2.6.15-rc3] snd_powermac: Add ID for Spring 2005 17" Powerbook

[Takashi Iwai]

At Tue, 29 Nov 2005 14:02:58 -0500,
Kyle Moffett wrote:
> 
> The audio chip in my Spring 2005 17" PowerBook was incorrectly  
> recognized as an AWACS chip.  This adds the chip ID to the  
> snd_powermac driver such that it is recognized as a Toonie (I don't  
> know if that's correct, but it's the only one that makes it work at  
> all). and sorts the ID lists numerically.  NOTE:  This chip is only  
> minimally supported at this point; it has system beep support and  
> very low volume speaker output, and that's about it.
> 
> Signed-off-by: Kyle Moffett <mrmacman_g4@mac.com>

Thanks, I applied it to ALSA tree now.


Takashi

Re: [PATCH][RFC][2.6.15-rc3] snd_powermac: Add ID for Spring 2005 17" Powerbook

[Kyle Moffett]

[-- Attachment #1: Type: text/plain, Size: 904 bytes --]

On Nov 30, 2005, at 05:55, Takashi Iwai wrote:
> At Tue, 29 Nov 2005 14:02:58 -0500,
> Kyle Moffett wrote:
>>
>> The audio chip in my Spring 2005 17" PowerBook was incorrectly  
>> recognized as an AWACS chip.  This adds the chip ID to the  
>> snd_powermac driver such that it is recognized as a Toonie (I  
>> don't know if that's correct, but it's the only one that makes it  
>> work at all). and sorts the ID lists numerically.  NOTE:  This  
>> chip is only minimally supported at this point; it has system beep  
>> support and very low volume speaker output, and that's about it.
>>
>> Signed-off-by: Kyle Moffett <mrmacman_g4@mac.com>
>
> Thanks, I applied it to ALSA tree now.

Damn, best revert that patch, I just realized I'm now getting a  
nonfatal oops during boot (probably due to the fact that the chip is  
not at all like a Toonie and only works using that driver due to  
sheer luck:

[-- Attachment #2: oops.txt --]
[-- Type: text/plain, Size: 2808 bytes --]

Nov 30 13:49:49 localhost kernel: input: PowerMac Beep as /class/input/input5
Nov 30 13:49:49 localhost kernel: Unable to handle kernel paging request for data at address 0xfe66e000
Nov 30 13:49:49 localhost kernel: Faulting instruction address: 0xc0015978
Nov 30 13:49:49 localhost kernel: Oops: Kernel access of bad area, sig: 11 [#1]
Nov 30 13:49:49 localhost kernel: PREEMPT 
Nov 30 13:49:49 localhost kernel: Modules linked in: sr_mod snd_powermac snd_pcm_oss snd_mixer_oss snd_pcm snd_timer snd soundcore snd_page_alloc sbp2 scsi_mod appletouch eth1394
Nov 30 13:49:49 localhost kernel: NIP: C0015978 LR: C00156D0 CTR: C0015970
Nov 30 13:49:49 localhost kernel: REGS: efe13be0 TRAP: 0300   Not tainted  (2.6.15-rc2-aphrodite2)
Nov 30 13:49:49 localhost kernel: MSR: 00009032 <EE,ME,IR,DR>  CR: 20000482  XER: 00000000
Nov 30 13:49:49 localhost kernel: DAR: FE66E000, DSISR: 40000000
Nov 30 13:49:49 localhost kernel: TASK = c1808c70[1095] 'alsactl' THREAD: efe12000
Nov 30 13:49:49 localhost kernel: GPR00: 00000004 EFE13C90 C1808C70 00000000 00880000 00000000 00000000 00000000 
Nov 30 13:49:49 localhost kernel: GPR08: 00000000 FDDEE000 C0015970 C0420000 20000448 100225F4 10026C68 00000000 
Nov 30 13:49:49 localhost kernel: GPR16: 7FFFA470 00000000 00000000 7FFFA580 1001D670 00000001 00000002 00000001 
Nov 30 13:49:49 localhost kernel: GPR24: C0F054A0 C0F054A0 C0E51800 FFFFFFF3 00000000 C19D8800 EFECA0C8 EFECA0C8 
Nov 30 13:49:49 localhost kernel: NIP [C0015978] core99_read_gpio+0x8/0x20
Nov 30 13:49:49 localhost kernel: LR [C00156D0] pmac_do_feature_call+0xb0/0x120
Nov 30 13:49:49 localhost kernel: Call Trace:
Nov 30 13:49:49 localhost kernel: [EFE13C90] [C00E8438] ext3_find_entry+0x458/0x650 (unreliable)
Nov 30 13:49:49 localhost kernel: [EFE13D10] [F2559754] check_audio_gpio+0x54/0x80 [snd_powermac]
Nov 30 13:49:49 localhost kernel: [EFE13D20] [F2559E88] toonie_put_mute_switch+0x88/0xe0 [snd_powermac]
Nov 30 13:49:49 localhost kernel: [EFE13D30] [F20EFA34] snd_ctl_elem_write+0x1d4/0x230 [snd]
Nov 30 13:49:49 localhost kernel: [EFE13D60] [F20F06AC] snd_ctl_ioctl+0xc1c/0x11f0 [snd]
Nov 30 13:49:49 localhost kernel: [EFE13EB0] [C009E804] do_ioctl+0x44/0xb0
Nov 30 13:49:49 localhost kernel: [EFE13ED0] [C009E8FC] vfs_ioctl+0x8c/0x510
Nov 30 13:49:49 localhost kernel: [EFE13F10] [C009EE14] sys_ioctl+0x94/0xb0
Nov 30 13:49:49 localhost kernel: [EFE13F40] [C000E46C] ret_from_syscall+0x0/0x44
Nov 30 13:49:49 localhost kernel: --- Exception: c01 at 0xfd8aeec
Nov 30 13:49:49 localhost kernel:     LR = 0xfe0e208
Nov 30 13:49:49 localhost kernel: Instruction dump:
Nov 30 13:49:49 localhost kernel: 4e800020 60000000 7d4903a6 4e800421 80010014 38210010 7c0803a6 4e800020 
Nov 30 13:49:49 localhost kernel: 60000000 60000000 3d60c042 812b342c <7c6920ae> 0c030000 4c00012c 4e800020 


[-- Attachment #3: Type: text/plain, Size: 378 bytes --]


Sorry for the trouble and thanks anyways!

Cheers,
Kyle Moffett

-----BEGIN GEEK CODE BLOCK-----
Version: 3.12
GCM/CS/IT/E/U d- s++: a18 C++++>$ ULBX*++++(+++)>$ P++++(+++)>$ L++++ 
(+++)>$ !E- W+++(++) N+++(++) o? K? w--- O? M++ V? PS+() PE+(-) Y+ PGP 
+ t+(+++) 5 X R? !tv-(--) b++++(++) DI+(++) D+++ G e>++++$ h*(+)>++$ r 
%(--)  !y?-(--)
------END GEEK CODE BLOCK------

Re: [PATCH][RFC][2.6.15-rc3] snd_powermac: Add ID for Spring 2005 17" Powerbook

[Takashi Iwai]

At Wed, 30 Nov 2005 13:58:13 -0500,
Kyle Moffett wrote:
> 
> On Nov 30, 2005, at 05:55, Takashi Iwai wrote:
> > At Tue, 29 Nov 2005 14:02:58 -0500,
> > Kyle Moffett wrote:
> >>
> >> The audio chip in my Spring 2005 17" PowerBook was incorrectly  
> >> recognized as an AWACS chip.  This adds the chip ID to the  
> >> snd_powermac driver such that it is recognized as a Toonie (I  
> >> don't know if that's correct, but it's the only one that makes it  
> >> work at all). and sorts the ID lists numerically.  NOTE:  This  
> >> chip is only minimally supported at this point; it has system beep  
> >> support and very low volume speaker output, and that's about it.
> >>
> >> Signed-off-by: Kyle Moffett <mrmacman_g4@mac.com>
> >
> > Thanks, I applied it to ALSA tree now.
> 
> Damn, best revert that patch, I just realized I'm now getting a  
> nonfatal oops during boot (probably due to the fact that the chip is  
> not at all like a Toonie and only works using that driver due to  
> sheer luck:

OK, I removed the id 0x40.

thanks,

Takashi