Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752198AbaFFJs3 (ORCPT ); Fri, 6 Jun 2014 05:48:29 -0400 Received: from mail-la0-f51.google.com ([209.85.215.51]:42210 "EHLO mail-la0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750874AbaFFJsZ (ORCPT ); Fri, 6 Jun 2014 05:48:25 -0400 X-Google-Original-Sender: Date: Fri, 6 Jun 2014 11:47:52 +0200 From: Johan Hovold To: Janne Kanniainen Cc: cooloney@gmail.com, rpurdie@rpsys.net, linux-kernel@vger.kernel.org, linux-leds@vger.kernel.org, linux-usb@vger.kernel.org, Jiri Kosina , linux-input@vger.kernel.org, Johan Hovold Subject: Re: [PATCH v2] leds: USB: Add support for MSI GT683R led panels Message-ID: <20140606094752.GB9307@localhost> References: <1402003746-6354-1-git-send-email-janne.kanniainen@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1402003746-6354-1-git-send-email-janne.kanniainen@gmail.com> User-Agent: Mutt/1.5.22 (2013-10-16) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org [ +CC: Jiri, linux-input, linux-usb (again) ] First of all, please reply to the original thread and make sure to not drop people or lists from CC. On Fri, Jun 06, 2014 at 12:29:06AM +0300, Janne Kanniainen wrote: > This driver adds support for USB controlled led panels that exist in > MSI GT683R laptop. I had a change to look at bit closer at this today and it turns out this is a HID device and as such is already claimed by the HID driver. There was a quirk added for this particular VID/PID by commit 620ae90ed8ca ("HID: usbhid: quirk for MSI GX680R led panel") in order to avoid a 10s delay at boot due to missing report descriptors: https://bugzilla.redhat.com/show_bug.cgi?id=907221 http://www.spinics.net/lists/linux-usb/msg54756.html Since this is a HID device (and the control requests you're doing are Set_Report requests) you should probably implement this as a specific HID driver if there's no generic support you can use directly. I've added Jiri Kosina (and linux-input) who knows a lot more about the HID layer and how this is supposed to be implemented as CC. > Changes in v2: > - sorted headers to alphabetic order > - using devm_kzalloc > - using BIT(n) > - using usb_control_msg instead of usb_submit_urb > - removing unneeded code There are still some issues in the code below, but I'll only point out the more problematic ones for now. > Signed-off-by: Janne Kanniainen > --- > drivers/leds/Kconfig | 6 ++ > drivers/leds/Makefile | 1 + > drivers/leds/leds-gt683r.c | 158 +++++++++++++++++++++++++++++++++++++++++++++ > 3 files changed, 165 insertions(+) > create mode 100644 drivers/leds/leds-gt683r.c > > diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig > index 6de9dfb..2cffa0c 100644 > --- a/drivers/leds/Kconfig > +++ b/drivers/leds/Kconfig > @@ -487,6 +487,12 @@ config LEDS_BLINKM > This option enables support for the BlinkM RGB LED connected > through I2C. Say Y to enable support for the BlinkM LED. > > +config LEDS_GT683R > + tristate "LED support for the MSI GT683R" > + depends on LEDS_CLASS && USB > + help > + This option enables support for the MSI GT683R LEDS > + > comment "LED Triggers" > source "drivers/leds/trigger/Kconfig" > > diff --git a/drivers/leds/Makefile b/drivers/leds/Makefile > index 3cd76db..af5fb4e 100644 > --- a/drivers/leds/Makefile > +++ b/drivers/leds/Makefile > @@ -54,6 +54,7 @@ obj-$(CONFIG_LEDS_ASIC3) += leds-asic3.o > obj-$(CONFIG_LEDS_MAX8997) += leds-max8997.o > obj-$(CONFIG_LEDS_LM355x) += leds-lm355x.o > obj-$(CONFIG_LEDS_BLINKM) += leds-blinkm.o > +obj-$(CONFIG_LEDS_GT683R) += leds-gt683r.o > > # LED SPI Drivers > obj-$(CONFIG_LEDS_DAC124S085) += leds-dac124s085.o > diff --git a/drivers/leds/leds-gt683r.c b/drivers/leds/leds-gt683r.c > new file mode 100644 > index 0000000..5a204ea > --- /dev/null > +++ b/drivers/leds/leds-gt683r.c > @@ -0,0 +1,158 @@ > +/* > + * MSI GT683R led driver > + * > + * Copyright (c) 2014 Janne Kanniainen > + * > + * This program is free software; you can redistribute it and/or > + * modify it under the terms of the GNU General Public License as > + * published by the Free Software Foundation; either version 2 of > + * the License, or (at your option) any later version. > + * > + * This program is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + * GNU General Public License for more details. > + * > + */ > + > +#include > +#include > +#include > +#include > +#include > + > +#define USB_DEVICE_ID_MSI_GT683R_LED_PANEL 0xff00 > +#define USB_VENDOR_ID_MSI 0x1770 > + > +#define GT683R_LED_BACK BIT(0) > +#define GT683R_LED_SIDE BIT(1) > +#define GT683R_LED_FRONT BIT(2) > +#define GT683R_LED_ALL (GT683R_LED_BACK | GT683R_LED_SIDE | GT683R_LED_FRONT) > + > +#define GT683R_LED_OFF 0 > +#define GT683R_LED_AUDIO 2 > +#define GT683R_LED_BREATHING 3 > +#define GT683R_LED_NORMAL 5 > + > +struct gt683r_led { > + struct usb_device *usb_dev; > + struct usb_endpoint_descriptor *ep; > + struct led_classdev led_dev; > + struct mutex lock; > + struct work_struct work; > + enum led_brightness brightness; > +}; > + > +static const struct usb_device_id gt683r_led_id[] = { > + { USB_DEVICE(USB_VENDOR_ID_MSI, USB_DEVICE_ID_MSI_GT683R_LED_PANEL) }, > + { } > +}; > + > +static const u64 gt683r_led_select_leds = 0x300201ULL; > +static const u64 gt683r_led_select_type = 0x100200201ULL; No, you'd still want to use byte arrays for this in order to handle endianess (if you are to keep these at all). For arrays you can use the ARRAY_SIZE() macro if that was the reason for this change. I should have mentioned that when I pointed out that you cannot use strlen(). Where did you get these (HID report) values from by the way? > + > +static void gt683r_brightness_set(struct led_classdev *led_cdev, > + enum led_brightness brightness) > +{ > + struct gt683r_led *led = > + container_of(led_cdev, struct gt683r_led, led_dev); > + > + mutex_lock(&led->lock); You cannot grab a mutex here since this function can be called from interrupt context (if I remember correctly). Either way, you shouldn't be holding the lock until the work task has finished... > + > + led->brightness = brightness; > + > + schedule_work(&led->work); > +} > + > +static int gt683r_led_snd_msg(struct gt683r_led *led, u64 msg) > +{ > + int result = usb_control_msg(led->usb_dev, > + usb_sndctrlpipe(led->usb_dev, > + led->ep->bEndpointAddress), No need to store the endpoint in the led struct as the address of endpoint 0 is 0. > + 0x09, 0x22, 0x0301, 0x0000, > + &msg, sizeof(u64), USB_CTRL_SET_TIMEOUT); You cannot use a stack allocated buffer (msg) for the data transfer as some platforms can't do DMA from the stack. > + if (result) > + dev_err(&led->usb_dev->dev, > + "Failed to send control message: %i\n", result); > + > + return result; > +} > + > +static void gt683r_led_set(struct gt683r_led *led, char type) > +{ > + gt683r_led_snd_msg(led, gt683r_led_select_leds | > + (GT683R_LED_ALL << 24)); > + gt683r_led_snd_msg(led, gt683r_led_select_type | > + (type << 24)); > +} > + > +static void gt683r_led_work(struct work_struct *work) > +{ > + struct gt683r_led *led = > + container_of(work, struct gt683r_led, work); > + > + if (led->brightness) > + gt683r_led_set(led, GT683R_LED_NORMAL); > + else > + gt683r_led_set(led, GT683R_LED_OFF); > + > + mutex_unlock(&led->lock); > +} > + > +static struct led_classdev gt683r_led_dev = { > + .name = "gt683r-led", > + .brightness_set = gt683r_brightness_set, > + .max_brightness = 1, > + .flags = LED_CORE_SUSPENDRESUME, > +}; > + > +static int gt683r_led_probe(struct usb_interface *intf, > + const struct usb_device_id *id) > +{ > + int ret = 0; > + struct gt683r_led *led = > + devm_kzalloc(&intf->dev, sizeof(struct gt683r_led), GFP_KERNEL); Again, please split definition and allocation. > + if (!led) > + return -ENOMEM; > + > + led->usb_dev = interface_to_usbdev(intf); > + usb_set_intfdata(intf, led); > + > + led->ep = &led->usb_dev->ep0.desc; > + if (!usb_endpoint_xfer_control(led->ep) || > + usb_endpoint_maxp(led->ep) != sizeof(u64)) > + return -EINVAL; EP0 is a control endpoint, and you probably don't need the max-packet-size test either. > + > + led->led_dev = gt683r_led_dev; > + ret = led_classdev_register(&led->usb_dev->dev, &led->led_dev); > + if (ret) { > + dev_err(&led->usb_dev->dev, "Could not register led_classdev\n"); > + return ret; > + } > + > + mutex_init(&led->lock); > + INIT_WORK(&led->work, gt683r_led_work); > + > + return 0; > +} > + > +static void gt683r_led_disconnect(struct usb_interface *intf) > +{ > + struct gt683r_led *led = usb_get_intfdata(intf); > + > + led_classdev_unregister(&led->led_dev); > + cancel_work_sync(&led->work); > +} > + > +static struct usb_driver gt683r_led_driver = { > + .probe = gt683r_led_probe, > + .disconnect = gt683r_led_disconnect, > + .name = "GT683R Led Driver", > + .id_table = gt683r_led_id, > +}; > + > +module_usb_driver(gt683r_led_driver); > + > +MODULE_AUTHOR("Janne Kanniainen"); > +MODULE_DESCRIPTION("MSI GT683R led driver"); > +MODULE_LICENSE("GPL"); Johan -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/