| Message ID | s5h8vsjy68z.wl%tiwai@suse.de |
|---|---|
| State | Not Applicable |
| Delegated to: | David Miller |
| Headers | show |
On Thu, Jun 30, 2011 at 12:15:56PM +0200, Takashi Iwai wrote: > At Thu, 30 Jun 2011 10:17:54 +0100, > Ralf Baechle wrote: > > > > Found on a MIPS build but certain other architectures will have the same > > issue: > > > > CC sound/isa/sb/sb16_csp.o > > sound/isa/sb/sb16_csp.c: In function ‘snd_sb_csp_ioctl’: > > sound/isa/sb/sb16_csp.c:228: error: case label does not reduce to an integer constant > > make[1]: *** [sound/isa/sb/sb16_csp.o] Error 1 > > make: *** [sound/isa/sb/sb16_csp.o] Error 2 > > > > This error message is caused by the _IOC_TYPECHECK() error check triggering > > due to excessive ioctl size on Alpha, PowerPC, MIPS and SPARC which define > > _IOC_SIZEBITS as 13. On all other architectures define it as 14 so struct > > snd_sb_csp_microcode with it's little over 12kB will just about fit into > > the 16kB limit. > > What about the patch below? I have no idea how big the soundblaster microcode being loaded actually is, that is if the reduced size of 0x1f00 will be sufficient. Aside of that I don't see a problem - I don't see how the old ioctl can possibly have been used before so there isn't a compatibility problem. Or you could entirely sidestep the problem and use request_firmware() but I guess that's more effort than you want to invest. > This is an old ISA driver, so the impact must be very low. True. I notice that sort of stuff in automated mass builds - not necessarily the sort of kernels one would actually use. Still build errors are annoying :) Ralf -- To unsubscribe from this list: send the line "unsubscribe sparclinux" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
At Thu, 30 Jun 2011 11:52:54 +0100, Ralf Baechle wrote: > > On Thu, Jun 30, 2011 at 12:15:56PM +0200, Takashi Iwai wrote: > > > At Thu, 30 Jun 2011 10:17:54 +0100, > > Ralf Baechle wrote: > > > > > > Found on a MIPS build but certain other architectures will have the same > > > issue: > > > > > > CC sound/isa/sb/sb16_csp.o > > > sound/isa/sb/sb16_csp.c: In function ‘snd_sb_csp_ioctl’: > > > sound/isa/sb/sb16_csp.c:228: error: case label does not reduce to an integer constant > > > make[1]: *** [sound/isa/sb/sb16_csp.o] Error 1 > > > make: *** [sound/isa/sb/sb16_csp.o] Error 2 > > > > > > This error message is caused by the _IOC_TYPECHECK() error check triggering > > > due to excessive ioctl size on Alpha, PowerPC, MIPS and SPARC which define > > > _IOC_SIZEBITS as 13. On all other architectures define it as 14 so struct > > > snd_sb_csp_microcode with it's little over 12kB will just about fit into > > > the 16kB limit. > > > > What about the patch below? > > I have no idea how big the soundblaster microcode being loaded actually is, > that is if the reduced size of 0x1f00 will be sufficient. The files found in /lib/firmware/sb16 are all under 2kB, thus likely sufficient. > Aside of that I > don't see a problem - I don't see how the old ioctl can possibly have been > used before so there isn't a compatibility problem. > > Or you could entirely sidestep the problem and use request_firmware() but > I guess that's more effort than you want to invest. Yeah, that's another option I thought of. But it's too intrusive for 3.0-rc6, so I'd like waive it for 3.1. > > This is an old ISA driver, so the impact must be very low. > > True. I notice that sort of stuff in automated mass builds - not > necessarily the sort of kernels one would actually use. Still build errors > are annoying :) Right, better to fix it up quickly. thanks, Takashi -- To unsubscribe from this list: send the line "unsubscribe sparclinux" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
At Thu, 30 Jun 2011 13:05:54 +0200, Takashi Iwai wrote: > > At Thu, 30 Jun 2011 11:52:54 +0100, > Ralf Baechle wrote: > > > > On Thu, Jun 30, 2011 at 12:15:56PM +0200, Takashi Iwai wrote: > > > > > At Thu, 30 Jun 2011 10:17:54 +0100, > > > Ralf Baechle wrote: > > > > > > > > Found on a MIPS build but certain other architectures will have the same > > > > issue: > > > > > > > > CC sound/isa/sb/sb16_csp.o > > > > sound/isa/sb/sb16_csp.c: In function ‘snd_sb_csp_ioctl’: > > > > sound/isa/sb/sb16_csp.c:228: error: case label does not reduce to an integer constant > > > > make[1]: *** [sound/isa/sb/sb16_csp.o] Error 1 > > > > make: *** [sound/isa/sb/sb16_csp.o] Error 2 > > > > > > > > This error message is caused by the _IOC_TYPECHECK() error check triggering > > > > due to excessive ioctl size on Alpha, PowerPC, MIPS and SPARC which define > > > > _IOC_SIZEBITS as 13. On all other architectures define it as 14 so struct > > > > snd_sb_csp_microcode with it's little over 12kB will just about fit into > > > > the 16kB limit. > > > > > > What about the patch below? > > > > I have no idea how big the soundblaster microcode being loaded actually is, > > that is if the reduced size of 0x1f00 will be sufficient. > > The files found in /lib/firmware/sb16 are all under 2kB, thus likely > sufficient. Too shortly answered. It turned out that some CSP codes (like Qsound) can be above that size, it's almost 12kB. So the size in the original code is really the necessary requirement, and the patch breaks for such a case. An ugly workaround would be to fake the ioctl size. But this is certainly to be avoided, since it has been broken on the specific platforms for ages, thus breaking for them would be mostly harmless, too. > > Aside of that I > > don't see a problem - I don't see how the old ioctl can possibly have been > > used before so there isn't a compatibility problem. > > > > Or you could entirely sidestep the problem and use request_firmware() but > > I guess that's more effort than you want to invest. > > Yeah, that's another option I thought of. But it's too intrusive for > 3.0-rc6, so I'd like waive it for 3.1. Actually the request_firmware() was implemented for some auto-loadable CSP codes. Others need the manual loading, so it is via ioctl. It can be converted, but I don't think it makes sense for such old stuff. After all, it still works with x86-ISA as is. thanks, Takashi -- To unsubscribe from this list: send the line "unsubscribe sparclinux" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thu, Jun 30, 2011 at 01:28:03PM +0200, Takashi Iwai wrote: > > > I have no idea how big the soundblaster microcode being loaded actually is, > > > that is if the reduced size of 0x1f00 will be sufficient. > > > > The files found in /lib/firmware/sb16 are all under 2kB, thus likely > > sufficient. > > Too shortly answered. It turned out that some CSP codes (like Qsound) > can be above that size, it's almost 12kB. So the size in the original > code is really the necessary requirement, and the patch breaks for > such a case. > > An ugly workaround would be to fake the ioctl size. But this is > certainly to be avoided, since it has been broken on the specific > platforms for ages, thus breaking for them would be mostly harmless, > too. > > > > Aside of that I > > > don't see a problem - I don't see how the old ioctl can possibly have been > > > used before so there isn't a compatibility problem. > > > > > > Or you could entirely sidestep the problem and use request_firmware() but > > > I guess that's more effort than you want to invest. > > > > Yeah, that's another option I thought of. But it's too intrusive for > > 3.0-rc6, so I'd like waive it for 3.1. > > Actually the request_firmware() was implemented for some auto-loadable > CSP codes. Others need the manual loading, so it is via ioctl. It > can be converted, but I don't think it makes sense for such old > stuff. After all, it still works with x86-ISA as is. In userland an empty definition will be used for _IOC_TYPECHECK so there won't be an error. So userland already is already using the existing value for SNDRV_SB_CSP_IOCTL_LOAD_CODE ... With a crude hack like #define SNDRV_SB_CSP_IOCTL_LOAD_CODE \ _IOC(_IOC_WRITE,'H', 0x11, sizeof(struct snd_sb_csp_microcode)) error checking can be bypassed and all will be fine as long as the resulting value doesn't result in in a a duplicate case value - which it doesn't, at least not in my testing. Should work but isn't nice. Ralf -- To unsubscribe from this list: send the line "unsubscribe sparclinux" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
At Thu, 30 Jun 2011 13:32:12 +0100, Ralf Baechle wrote: > > On Thu, Jun 30, 2011 at 01:28:03PM +0200, Takashi Iwai wrote: > > > > > I have no idea how big the soundblaster microcode being loaded actually is, > > > > that is if the reduced size of 0x1f00 will be sufficient. > > > > > > The files found in /lib/firmware/sb16 are all under 2kB, thus likely > > > sufficient. > > > > Too shortly answered. It turned out that some CSP codes (like Qsound) > > can be above that size, it's almost 12kB. So the size in the original > > code is really the necessary requirement, and the patch breaks for > > such a case. > > > > An ugly workaround would be to fake the ioctl size. But this is > > certainly to be avoided, since it has been broken on the specific > > platforms for ages, thus breaking for them would be mostly harmless, > > too. > > > > > > Aside of that I > > > > don't see a problem - I don't see how the old ioctl can possibly have been > > > > used before so there isn't a compatibility problem. > > > > > > > > Or you could entirely sidestep the problem and use request_firmware() but > > > > I guess that's more effort than you want to invest. > > > > > > Yeah, that's another option I thought of. But it's too intrusive for > > > 3.0-rc6, so I'd like waive it for 3.1. > > > > Actually the request_firmware() was implemented for some auto-loadable > > CSP codes. Others need the manual loading, so it is via ioctl. It > > can be converted, but I don't think it makes sense for such old > > stuff. After all, it still works with x86-ISA as is. > > In userland an empty definition will be used for _IOC_TYPECHECK so there > won't be an error. So userland already is already using the existing > value for SNDRV_SB_CSP_IOCTL_LOAD_CODE ... Right. It has an invalid direction (3), but apps won't care such details anyway. > With a crude hack like > > #define SNDRV_SB_CSP_IOCTL_LOAD_CODE \ > _IOC(_IOC_WRITE,'H', 0x11, sizeof(struct snd_sb_csp_microcode)) > > error checking can be bypassed and all will be fine as long as the > resulting value doesn't result in in a a duplicate case value - which it > doesn't, at least not in my testing. > > Should work but isn't nice. Indeed. But which is uglier is hard to answer :) If you are fine with the hacked ioctl number above, I can put it with some comments. This won't break anything, at least. thanks, Takashi -- To unsubscribe from this list: send the line "unsubscribe sparclinux" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thu, Jun 30, 2011 at 02:38:20PM +0200, Takashi Iwai wrote: > > In userland an empty definition will be used for _IOC_TYPECHECK so there > > won't be an error. So userland already is already using the existing > > value for SNDRV_SB_CSP_IOCTL_LOAD_CODE ... > > Right. It has an invalid direction (3), but apps won't care such > details anyway. > > > With a crude hack like > > > > #define SNDRV_SB_CSP_IOCTL_LOAD_CODE \ > > _IOC(_IOC_WRITE,'H', 0x11, sizeof(struct snd_sb_csp_microcode)) > > > > error checking can be bypassed and all will be fine as long as the > > resulting value doesn't result in in a a duplicate case value - which it > > doesn't, at least not in my testing. > > > > Should work but isn't nice. > > Indeed. But which is uglier is hard to answer :) > > If you are fine with the hacked ioctl number above, I can put it > with some comments. This won't break anything, at least. Go ahead then and yes, this really deserves a comment. Ralf -- To unsubscribe from this list: send the line "unsubscribe sparclinux" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thursday 30 June 2011, Ralf Baechle wrote: > #define SNDRV_SB_CSP_IOCTL_LOAD_CODE \ > _IOC(_IOC_WRITE,'H', 0x11, sizeof(struct snd_sb_csp_microcode)) > > error checking can be bypassed and all will be fine as long as the > resulting value doesn't result in in a a duplicate case value - which it > doesn't, at least not in my testing. > > Should work but isn't nice. Right. It's probably the best we can do. I think we added a few similar definitions when we originally introduce _IOC_TYPECHECK. The idea was never to break existing code, but rather to avoid merging new drivers that use inconsistent ioctl command numbers. Arnd -- To unsubscribe from this list: send the line "unsubscribe sparclinux" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Ralf Baechle wrote: > I have no idea how big the soundblaster microcode being loaded actually is, > that is if the reduced size of 0x1f00 will be sufficient. The biggest file is WFM0001A.CSP with 0x2df0 bytes. > I don't see how the old ioctl can possibly have been > used before so there isn't a compatibility problem. The code uses SNDRV_SB_CSP_MAX_MICROCODE_FILE_SIZE but doesn't care what the size field of the ioctl code is, so we could use any random value on those architectures. > Or you could entirely sidestep the problem and use request_firmware() > but I guess that's more effort than you want to invest. The driver already implements this for a bunch of predefined CSP code blobs. I'm not sure whether anybody has ever loaded additional .csp files. Regards, Clemens -- To unsubscribe from this list: send the line "unsubscribe sparclinux" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/include/sound/sb16_csp.h b/include/sound/sb16_csp.h index 736eac7..2806586 100644 --- a/include/sound/sb16_csp.h +++ b/include/sound/sb16_csp.h @@ -60,7 +60,12 @@ #define SNDRV_SB_CSP_QSOUND_MAX_RIGHT 0x20 /* maximum microcode RIFF file size */ +#if _IOC_SIZEBITS < 14 +/* reduced the size to fit with ioctl size limit */ +#define SNDRV_SB_CSP_MAX_MICROCODE_FILE_SIZE 0x1f00 +#else #define SNDRV_SB_CSP_MAX_MICROCODE_FILE_SIZE 0x3000 +#endif /* microcode header */ struct snd_sb_csp_mc_header {