Em 03-06-2010 19:06, Jarod Wilson escreveu: > On Thu, Jun 03, 2010 at 03:02:11AM -0300, Mauro Carvalho Chehab wrote: >> Em 01-06-2010 17:51, Jarod Wilson escreveu: >>> Add the core lirc device interface (http://lirc.org/). >>> >>> This is a 99.9% unaltered lirc_dev device interface (only change being >>> the path to lirc.h), which has been carried in the Fedora kernels and >>> has been built for numerous other distro kernels for years. In the >>> next two patches in this series, ir-core will be wired up to make use >>> of the lirc interface as one of many IR protocol decoder options. In >>> this case, raw IR will be delivered to the lirc userspace daemon, which >>> will then handle the decoding. >>> >>> Signed-off-by: Jarod Wilson <ja...@redhat.com> >>> --- >>> drivers/media/IR/Kconfig | 11 + >>> drivers/media/IR/Makefile | 1 + >>> drivers/media/IR/lirc_dev.c | 850 >>> +++++++++++++++++++++++++++++++++++++++++++ >>> drivers/media/IR/lirc_dev.h | 228 ++++++++++++ >>> include/media/lirc.h | 159 ++++++++ >>> 5 files changed, 1249 insertions(+), 0 deletions(-) >>> create mode 100644 drivers/media/IR/lirc_dev.c >>> create mode 100644 drivers/media/IR/lirc_dev.h >>> create mode 100644 include/media/lirc.h >>> > ... >>> +#ifdef CONFIG_COMPAT >>> +#define LIRC_GET_FEATURES_COMPAT32 _IOR('i', 0x00000000, __u32) >>> + >>> +#define LIRC_GET_SEND_MODE_COMPAT32 _IOR('i', 0x00000001, __u32) >>> +#define LIRC_GET_REC_MODE_COMPAT32 _IOR('i', 0x00000002, __u32) >>> + >>> +#define LIRC_GET_LENGTH_COMPAT32 _IOR('i', 0x0000000f, __u32) >>> + >>> +#define LIRC_SET_SEND_MODE_COMPAT32 _IOW('i', 0x00000011, __u32) >>> +#define LIRC_SET_REC_MODE_COMPAT32 _IOW('i', 0x00000012, __u32) >>> + >>> +long lirc_dev_fop_compat_ioctl(struct file *file, >>> + unsigned int cmd32, >>> + unsigned long arg) >>> +{ >>> + mm_segment_t old_fs; >>> + int ret; >>> + unsigned long val; >>> + unsigned int cmd; >>> + >>> + switch (cmd32) { >>> + case LIRC_GET_FEATURES_COMPAT32: >>> + case LIRC_GET_SEND_MODE_COMPAT32: >>> + case LIRC_GET_REC_MODE_COMPAT32: >>> + case LIRC_GET_LENGTH_COMPAT32: >>> + case LIRC_SET_SEND_MODE_COMPAT32: >>> + case LIRC_SET_REC_MODE_COMPAT32: >>> + /* >>> + * These commands expect (unsigned long *) arg >>> + * but the 32-bit app supplied (__u32 *). >>> + * Conversion is required. >>> + */ >>> + if (get_user(val, (__u32 *)compat_ptr(arg))) >>> + return -EFAULT; >>> + lock_kernel(); >> >> Hmm... BKL? Are you sure you need it here? As BKL are being removed, please >> rewrite >> it to use another kind of lock. >> >> On a first glance, I suspect that you should be locking &ir->irctl_lock >> inside >> lirc_dev_fop_ioctl() and just remove the BKL calls on >> lirc_dev_fop_compat_ioctl(). > > Ew, yeah, looks like there's some missing locking in lirc_dev_fop_ioctl(), > though its never been a problem in practice, from what I've seen... Okay, > will add locking there.
Ok, thanks. Well, in the past, the ioctl where already blocked by BKL. So, the lock is/will probably needed only with newer kernels. > As for the compat bits... I actually pulled them out of the Fedora kernel > and userspace for a while, and there were only a few people who really ran > into issues with it, but I think if the new userspace and kernel are rolled > out at the same time in a new distro release (i.e., Fedora 14, in our > particular case), it should be mostly transparent to users. For sure this will happen on all distros that follows upstream: they'll update lirc to fulfill the minimal requirement at Documentation/Changes. The issue will appear only to people that manually compile kernel and lirc. Those users are likely smart enough to upgrade to a newer lirc version if they notice a trouble, and to check at the forums. > Christoph > wasn't a fan of the change, and actually asked me to revert it, so I'm > cc'ing him here for further feedback, but I'm inclined to say that if this > is the price we pay to get upstream, so be it. I understand Christoph view, but I think that having to deal with compat stuff forever is a high price to pay, as the impact of this change is transitory and shouldn't be hard to deal with. >> Btw, as this is the first in-tree kernel driver for lirc, I would just >> define the >> lirc ioctls with __u32 and remove the entire compat stuff. > > I've pushed a patch into my ir-wip tree, ir branch, that does this: > > http://git.wilsonet.com/linux-2.6-ir-wip.git/?a=shortlog;h=refs/heads/ir > > I've tested it out, and things still work as expected w/my mceusb port and > the ir-lirc-codec ir-core bridge driver, after rebuilding the lirc > userspace (64-bit host) to match up the ioctl definitions. Patches look sane on my eyes. > >>> +/* >>> + * from the next key press on the driver will send >>> + * LIRC_MODE2_FREQUENCY packets >>> + */ >>> +#define LIRC_MEASURE_CARRIER_ENABLE _IO('i', 0x00000021) >>> +#define LIRC_MEASURE_CARRIER_DISABLE _IO('i', 0x00000022) >>> + >>> +#endif >> >> Wow! There are lots of ioctls that aren't currently used. IMO, the better is >> to add >> at the file just the ioctls that are currently in usage, and to put some >> documentation >> about them at /Documentation. > > Several of the ioctls were only very recently (past 4 months) added, but I > haven't a clue what they're actually used for... Adding something to > Documentation/ would definitely be prudent in any case. > The betters is to remove (or put them inside a #if 0 block) while they are not actually used at the code. I'm against the idea of adding new userspace API ioctls without any in-kernel driver using it. New ioctls can easily be added, but removing an ioctl can be a problem, so better to only add the things that we have a clear idea about its usage. Also, please add a patch against the media DocBook with the ioctls that are being added for the LIRC API. There's already a chapter there talking about IR. They are at Documentation/DocBook/v4l. Feel free to move to another sub-directory if you want, but the most important is to document the API's that are currently being defined. Cheers, Mauro. -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
