[patch 00/14] Sort out i8253 and PC speaker locking and headers
No longer terribly relevant these days but still broken and just an eyesore mess of neglience just as I've already raised it a few days ago. Time to sort this. drivers/input/misc/pcspkr.c: #if defined(CONFIG_MIPS) || defined(CONFIG_X86) /* Use the global PIT lock ! */ #include #else #include static DEFINE_RAW_SPINLOCK(i8253_lock); #endif sound/drivers/pcsp/pcsp.h: #if defined(CONFIG_MIPS) || defined(CONFIG_X86) /* Use the global PIT lock ! */ #include #else #include static DEFINE_RAW_SPINLOCK(i8253_lock); $ git grep -F pcsp.h sound/drivers/pcsp sound/drivers/pcsp/pcsp.c:#include "pcsp.h" sound/drivers/pcsp/pcsp_input.c:#include "pcsp.h" sound/drivers/pcsp/pcsp_lib.c:#include "pcsp.h" sound/drivers/pcsp/pcsp_mixer.c:#include "pcsp.h" $ git grep -w i8253_lock sound/drivers/pcsp/ sound/drivers/pcsp/pcsp.h:static DEFINE_RAW_SPINLOCK(i8253_lock); sound/drivers/pcsp/pcsp_input.c:raw_spin_lock_irqsave(&i8253_lock, flags sound/drivers/pcsp/pcsp_input.c:raw_spin_unlock_irqrestore(&i8253_lock, sound/drivers/pcsp/pcsp_lib.c: raw_spin_lock_irqsave(&i8253_lock, flags sound/drivers/pcsp/pcsp_lib.c: raw_spin_unlock_irqrestore(&i8253_lock, sound/drivers/pcsp/pcsp_lib.c: raw_spin_lock(&i8253_lock); sound/drivers/pcsp/pcsp_lib.c: raw_spin_unlock(&i8253_lock); sound/drivers/pcsp/pcsp_lib.c: raw_spin_lock(&i8253_lock); sound/drivers/pcsp/pcsp_lib.c: raw_spin_unlock(&i8253_lock); Locks are great, everybody should have their own lock! $ find . -name 8253pit.h ./arch/powerpc/include/asm/8253pit.h ./arch/alpha/include/asm/8253pit.h $ cat arch/*/include/asm/8253pit.h /* * 8253/8254 Programmable Interval Timer */ /* * 8253/8254 Programmable Interval Timer */ $ Eh... $ git grep -w PCSPKR_PLATFORM arch/mips/Kconfig: select PCSPKR_PLATFORM arch/mips/Kconfig: select PCSPKR_PLATFORM arch/mips/Kconfig: select PCSPKR_PLATFORM arch/powerpc/platforms/amigaone/Kconfig:select PCSPKR_PLATFORM drivers/input/misc/Kconfig: depends on PCSPKR_PLATFORM init/Kconfig:config PCSPKR_PLATFORM sound/drivers/Kconfig: depends on PCSPKR_PLATFORM && X86 && HIGH_RES_TIMERS So the status is: Alpha: There is no PCSPKR_PLATFORM so while a platform device is being installed no drivers will be built. I don't know which Alpha platforms or even if all of Alpha should be doing a PCSPKR_PLATFORM so I haven't even tried to sort this. ARM: No PC speaker supported, yeah :) PowerPC: Should compile but the locking is wrong but only the AmigaOne platforms should be affected. MIPS: Ok. x86: Ok. All others:No PC speaker supported Also only the plain old IBM PC XT was using a i8253; every later system had i8254. So maybe this is the time for renaming the support code? Ralf ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [patch 00/14] Sort out i8253 and PC speaker locking and headers
Original-Nachricht > Datum: Wed, 01 Jun 2011 19:04:56 +0100 > Von: r...@linux-mips.org > An: linux-ker...@vger.kernel.org, linux-a...@vger.kernel.org, > linux-al...@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, > linux-m...@linux-mips.org > Betreff: [patch 00/14] Sort out i8253 and PC speaker locking and headers > No longer terribly relevant these days but still broken and just an > eyesore mess of neglience just as I've already raised it a few days > ago. Time to sort this. > > drivers/input/misc/pcspkr.c: > > #if defined(CONFIG_MIPS) || defined(CONFIG_X86) > /* Use the global PIT lock ! */ > #include > #else > #include > static DEFINE_RAW_SPINLOCK(i8253_lock); > #endif > > sound/drivers/pcsp/pcsp.h: > > #if defined(CONFIG_MIPS) || defined(CONFIG_X86) > /* Use the global PIT lock ! */ > #include > #else > #include > static DEFINE_RAW_SPINLOCK(i8253_lock); > > $ git grep -F pcsp.h sound/drivers/pcsp > sound/drivers/pcsp/pcsp.c:#include "pcsp.h" > sound/drivers/pcsp/pcsp_input.c:#include "pcsp.h" > sound/drivers/pcsp/pcsp_lib.c:#include "pcsp.h" > sound/drivers/pcsp/pcsp_mixer.c:#include "pcsp.h" > $ git grep -w i8253_lock sound/drivers/pcsp/ > sound/drivers/pcsp/pcsp.h:static DEFINE_RAW_SPINLOCK(i8253_lock); > sound/drivers/pcsp/pcsp_input.c:raw_spin_lock_irqsave(&i8253_lock, > flags > sound/drivers/pcsp/pcsp_input.c: > raw_spin_unlock_irqrestore(&i8253_lock, > sound/drivers/pcsp/pcsp_lib.c: raw_spin_lock_irqsave(&i8253_lock, > flags > sound/drivers/pcsp/pcsp_lib.c: > raw_spin_unlock_irqrestore(&i8253_lock, > sound/drivers/pcsp/pcsp_lib.c: raw_spin_lock(&i8253_lock); > sound/drivers/pcsp/pcsp_lib.c: raw_spin_unlock(&i8253_lock); > sound/drivers/pcsp/pcsp_lib.c: raw_spin_lock(&i8253_lock); > sound/drivers/pcsp/pcsp_lib.c: raw_spin_unlock(&i8253_lock); > > Locks are great, everybody should have their own lock! > > $ find . -name 8253pit.h > ./arch/powerpc/include/asm/8253pit.h > ./arch/alpha/include/asm/8253pit.h > $ cat arch/*/include/asm/8253pit.h > /* > * 8253/8254 Programmable Interval Timer > */ > /* > * 8253/8254 Programmable Interval Timer > */ > $ > > Eh... > > $ git grep -w PCSPKR_PLATFORM > arch/mips/Kconfig: select PCSPKR_PLATFORM > arch/mips/Kconfig: select PCSPKR_PLATFORM > arch/mips/Kconfig: select PCSPKR_PLATFORM > arch/powerpc/platforms/amigaone/Kconfig:select PCSPKR_PLATFORM > drivers/input/misc/Kconfig: depends on PCSPKR_PLATFORM > init/Kconfig:config PCSPKR_PLATFORM > sound/drivers/Kconfig: depends on PCSPKR_PLATFORM && X86 && > HIGH_RES_TIMERS > > So the status is: > > Alpha: There is no PCSPKR_PLATFORM so while a platform device is > being installed no drivers will be built. I don't know > which Alpha platforms or even if all of Alpha should be > doing a PCSPKR_PLATFORM so I haven't even tried to sort > this. > ARM: No PC speaker supported, yeah :) > PowerPC: Should compile but the locking is wrong but only the > AmigaOne platforms should be affected. The Kconfig dependencies cleanup patch for CHRP, PSERIES, etc. should also apply to the AmigaOne. Can you resend it with a fix for the AmigaOne, or should I send a patch? I'll check next week, if the PC speaker is still working on my AmigaOne. Thanks, Gerhard -- Empfehlen Sie GMX DSL Ihren Freunden und Bekannten und wir belohnen Sie mit bis zu 50,- Euro! https://freundschaftswerbung.gmx.de ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [patch 00/14] Sort out i8253 and PC speaker locking and headers
On Thu, Jun 02, 2011 at 09:11:19PM +0200, Gerhard Pircher wrote: > > #if defined(CONFIG_MIPS) || defined(CONFIG_X86) > > /* Use the global PIT lock ! */ > > #include > > #else > > #include > > static DEFINE_RAW_SPINLOCK(i8253_lock); > > #endif > > > > sound/drivers/pcsp/pcsp.h: > > > > #if defined(CONFIG_MIPS) || defined(CONFIG_X86) > > /* Use the global PIT lock ! */ > > #include > > #else > > #include > > static DEFINE_RAW_SPINLOCK(i8253_lock); > > > > $ git grep -F pcsp.h sound/drivers/pcsp > > sound/drivers/pcsp/pcsp.c:#include "pcsp.h" > > sound/drivers/pcsp/pcsp_input.c:#include "pcsp.h" > > sound/drivers/pcsp/pcsp_lib.c:#include "pcsp.h" > > sound/drivers/pcsp/pcsp_mixer.c:#include "pcsp.h" > > $ git grep -w i8253_lock sound/drivers/pcsp/ > > sound/drivers/pcsp/pcsp.h:static DEFINE_RAW_SPINLOCK(i8253_lock); > > sound/drivers/pcsp/pcsp_input.c:raw_spin_lock_irqsave(&i8253_lock, > > flags > > sound/drivers/pcsp/pcsp_input.c: > > raw_spin_unlock_irqrestore(&i8253_lock, > > sound/drivers/pcsp/pcsp_lib.c: raw_spin_lock_irqsave(&i8253_lock, > > flags > > sound/drivers/pcsp/pcsp_lib.c: > > raw_spin_unlock_irqrestore(&i8253_lock, > > sound/drivers/pcsp/pcsp_lib.c: raw_spin_lock(&i8253_lock); > > sound/drivers/pcsp/pcsp_lib.c: raw_spin_unlock(&i8253_lock); > > sound/drivers/pcsp/pcsp_lib.c: raw_spin_lock(&i8253_lock); > > sound/drivers/pcsp/pcsp_lib.c: raw_spin_unlock(&i8253_lock); > > > > Locks are great, everybody should have their own lock! > > > > $ find . -name 8253pit.h > > ./arch/powerpc/include/asm/8253pit.h > > ./arch/alpha/include/asm/8253pit.h > > $ cat arch/*/include/asm/8253pit.h > > /* > > * 8253/8254 Programmable Interval Timer > > */ > > /* > > * 8253/8254 Programmable Interval Timer > > */ > > $ > > > > Eh... > > > > $ git grep -w PCSPKR_PLATFORM > > arch/mips/Kconfig: select PCSPKR_PLATFORM > > arch/mips/Kconfig: select PCSPKR_PLATFORM > > arch/mips/Kconfig: select PCSPKR_PLATFORM > > arch/powerpc/platforms/amigaone/Kconfig:select PCSPKR_PLATFORM > > drivers/input/misc/Kconfig: depends on PCSPKR_PLATFORM > > init/Kconfig:config PCSPKR_PLATFORM > > sound/drivers/Kconfig: depends on PCSPKR_PLATFORM && X86 && > > HIGH_RES_TIMERS > > > > So the status is: > > > > Alpha: There is no PCSPKR_PLATFORM so while a platform device is > > being installed no drivers will be built. I don't know > > which Alpha platforms or even if all of Alpha should be > > doing a PCSPKR_PLATFORM so I haven't even tried to sort > > this. > > ARM: No PC speaker supported, yeah :) > > PowerPC: Should compile but the locking is wrong but only the > > AmigaOne platforms should be affected. > The Kconfig dependencies cleanup patch for CHRP, PSERIES, etc. should > also apply to the AmigaOne. Can you resend it with a fix for the > AmigaOne, or should I send a patch? I can sort that; it's easy enough. > I'll check next week, if the PC speaker is still working on my AmigaOne. I can't imagine that it's going to break - the code is sorta simple ;-) One obscurity I noticed is this bit in the amigaone.dts: timer@40 { // Also adds pcspkr to platform devices. compatible = "pnpPNP,100"; reg = <1 0x0040 0x0020>; }; Shouldn't that rather be something like the following? pcspeaker@61 { device_type = "sound"; compatible = "pnpPNP,800"; reg = <1 0x61 1>; }; pnpPNP,100 is the i8253 timer as I understand and pnpPNP,800 the PC speaker. If you interpret pnpPNP,100 to imply the presence of a PC speaker you can't express a system that has a i8253 but no PCspeaker in a DT so maybe amigaone.dts and arch/powerpc/kernel/setup-common.c should be changed to use pnpPNP,800 instead? Ralf ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [patch 00/14] Sort out i8253 and PC speaker locking and headers
Original-Nachricht > Datum: Fri, 3 Jun 2011 19:00:38 +0100 > Von: Ralf Baechle > An: Gerhard Pircher > CC: linux-m...@linux-mips.org, linuxppc-dev@lists.ozlabs.org, > linux-al...@vger.kernel.org, linux-a...@vger.kernel.org, > linux-ker...@vger.kernel.org, Thomas Gleixner , Benjamin > Herrenschmidt > Betreff: Re: [patch 00/14] Sort out i8253 and PC speaker locking and headers > On Thu, Jun 02, 2011 at 09:11:19PM +0200, Gerhard Pircher wrote: > > > > #if defined(CONFIG_MIPS) || defined(CONFIG_X86) > > > /* Use the global PIT lock ! */ > > > #include > > > #else > > > #include > > > static DEFINE_RAW_SPINLOCK(i8253_lock); > > > #endif > > > > > > sound/drivers/pcsp/pcsp.h: > > > > > > #if defined(CONFIG_MIPS) || defined(CONFIG_X86) > > > /* Use the global PIT lock ! */ > > > #include > > > #else > > > #include > > > static DEFINE_RAW_SPINLOCK(i8253_lock); > > > > > > $ git grep -F pcsp.h sound/drivers/pcsp > > > sound/drivers/pcsp/pcsp.c:#include "pcsp.h" > > > sound/drivers/pcsp/pcsp_input.c:#include "pcsp.h" > > > sound/drivers/pcsp/pcsp_lib.c:#include "pcsp.h" > > > sound/drivers/pcsp/pcsp_mixer.c:#include "pcsp.h" > > > $ git grep -w i8253_lock sound/drivers/pcsp/ > > > sound/drivers/pcsp/pcsp.h:static DEFINE_RAW_SPINLOCK(i8253_lock); > > > sound/drivers/pcsp/pcsp_input.c: > raw_spin_lock_irqsave(&i8253_lock, > > > flags > > > sound/drivers/pcsp/pcsp_input.c: > > > raw_spin_unlock_irqrestore(&i8253_lock, > > > sound/drivers/pcsp/pcsp_lib.c: > raw_spin_lock_irqsave(&i8253_lock, > > > flags > > > sound/drivers/pcsp/pcsp_lib.c: > > > raw_spin_unlock_irqrestore(&i8253_lock, > > > sound/drivers/pcsp/pcsp_lib.c: raw_spin_lock(&i8253_lock); > > > sound/drivers/pcsp/pcsp_lib.c: raw_spin_unlock(&i8253_lock); > > > sound/drivers/pcsp/pcsp_lib.c: raw_spin_lock(&i8253_lock); > > > sound/drivers/pcsp/pcsp_lib.c: raw_spin_unlock(&i8253_lock); > > > > > > Locks are great, everybody should have their own lock! > > > > > > $ find . -name 8253pit.h > > > ./arch/powerpc/include/asm/8253pit.h > > > ./arch/alpha/include/asm/8253pit.h > > > $ cat arch/*/include/asm/8253pit.h > > > /* > > > * 8253/8254 Programmable Interval Timer > > > */ > > > /* > > > * 8253/8254 Programmable Interval Timer > > > */ > > > $ > > > > > > Eh... > > > > > > $ git grep -w PCSPKR_PLATFORM > > > arch/mips/Kconfig: select PCSPKR_PLATFORM > > > arch/mips/Kconfig: select PCSPKR_PLATFORM > > > arch/mips/Kconfig: select PCSPKR_PLATFORM > > > arch/powerpc/platforms/amigaone/Kconfig:select PCSPKR_PLATFORM > > > drivers/input/misc/Kconfig: depends on PCSPKR_PLATFORM > > > init/Kconfig:config PCSPKR_PLATFORM > > > sound/drivers/Kconfig: depends on PCSPKR_PLATFORM && X86 && > > > HIGH_RES_TIMERS > > > > > > So the status is: > > > > > > Alpha: There is no PCSPKR_PLATFORM so while a platform device is > > > being installed no drivers will be built. I don't know > > > which Alpha platforms or even if all of Alpha should be > > > doing a PCSPKR_PLATFORM so I haven't even tried to sort > > > this. > > > ARM: No PC speaker supported, yeah :) > > > PowerPC: Should compile but the locking is wrong but only the > > > AmigaOne platforms should be affected. > > The Kconfig dependencies cleanup patch for CHRP, PSERIES, etc. should > > also apply to the AmigaOne. Can you resend it with a fix for the > > AmigaOne, or should I send a patch? > > I can sort that; it's easy enough. Thanks a lot! > > I'll check next week, if the PC speaker is still working on my > > AmigaOne. > > I can't imagine that it's going to break - the code is sorta simple ;-) That's true, but testing the most recent Linux kernel on the AmigaOne is never wrong. :-) > One obscurity I noticed is this bit in the amigaone.dts: > > timer@40 { > // Also adds pcspkr to platform devices. > compatible = "pnpPNP,100"; > reg = <1 0x0040 0x0020>; > }; &