kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

misc: mic: add threaded irq support in card driver

Browse source 
Add threaded irq support in mic_request_card_irq which will be used
for virtual devices added on mic bus.

Reviewed-by: Ashutosh Dixit <ashutosh.dixit@intel.com>
Reviewed-by: Nikhil Rao <nikhil.rao@intel.com>
Reviewed-by: Sudeep Dutt <sudeep.dutt@intel.com>
Signed-off-by: Siva Yerramreddy <yshivakrishna@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Siva Yerramreddy 2014-07-11 14:04:24 -07:00 committed by Greg Kroah-Hartman
parent d4ef098e4c
commit 9c3d37c7a1
3 changed files with 20 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
drivers/misc/mic/card/mic_device.c
View file

@ -83,8 +83,8 @@ static int mic_shutdown_init(void)
int shutdown_db; int shutdown_db;
shutdown_db = mic_next_card_db(); shutdown_db = mic_next_card_db();
shutdown_cookie = mic_request_card_irq(mic_shutdown_isr, shutdown_cookie = mic_request_card_irq(mic_shutdown_isr, NULL,
"Shutdown", mdrv, shutdown_db); "Shutdown", mdrv, shutdown_db);
if (IS_ERR(shutdown_cookie)) if (IS_ERR(shutdown_cookie))
rc = PTR_ERR(shutdown_cookie); rc = PTR_ERR(shutdown_cookie);
else else
@ -136,7 +136,8 @@ static void mic_dp_uninit(void)
/** /**
* mic_request_card_irq - request an irq. * mic_request_card_irq - request an irq.
* *
* @func: The callback function that handles the interrupt. * @handler: interrupt handler passed to request_threaded_irq.
* @thread_fn: thread fn. passed to request_threaded_irq.
* @name: The ASCII name of the callee requesting the irq. * @name: The ASCII name of the callee requesting the irq.
* @data: private data that is returned back when calling the * @data: private data that is returned back when calling the
* function handler. * function handler.
@ -149,17 +150,19 @@ static void mic_dp_uninit(void)
* error code. * error code.
* *
*/ */
struct mic_irq *mic_request_card_irq(irqreturn_t (*func)(int irq, void *data), struct mic_irq *
const char *name, void *data, int index) mic_request_card_irq(irq_handler_t handler,
irq_handler_t thread_fn, const char *name,
void *data, int index)
{ {
int rc = 0; int rc = 0;
unsigned long cookie; unsigned long cookie;
struct mic_driver *mdrv = g_drv; struct mic_driver *mdrv = g_drv;
rc = request_irq(mic_db_to_irq(mdrv, index), func, rc = request_threaded_irq(mic_db_to_irq(mdrv, index), handler,
0, name, data); thread_fn, 0, name, data);
if (rc) { if (rc) {
dev_err(mdrv->dev, "request_irq failed rc = %d\n", rc); dev_err(mdrv->dev, "request_threaded_irq failed rc = %d\n", rc);
goto err; goto err;
} }
mdrv->irq_info.irq_usage_count[index]++; mdrv->irq_info.irq_usage_count[index]++;
@ -172,9 +175,9 @@ err:
/** /**
* mic_free_card_irq - free irq. * mic_free_card_irq - free irq.
* *
* @cookie: cookie obtained during a successful call to mic_request_irq * @cookie: cookie obtained during a successful call to mic_request_threaded_irq
* @data: private data specified by the calling function during the * @data: private data specified by the calling function during the
* mic_request_irq * mic_request_threaded_irq
* *
* returns: none. * returns: none.
*/ */

5
drivers/misc/mic/card/mic_device.h
View file

@ -30,6 +30,7 @@
#include <linux/workqueue.h> #include <linux/workqueue.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/irqreturn.h> #include <linux/irqreturn.h>
#include <linux/interrupt.h>
/** /**
* struct mic_intr_info - Contains h/w specific interrupt sources info * struct mic_intr_info - Contains h/w specific interrupt sources info
@ -116,8 +117,8 @@ mic_mmio_write(struct mic_mw *mw, u32 val, u32 offset)
int mic_driver_init(struct mic_driver *mdrv); int mic_driver_init(struct mic_driver *mdrv);
void mic_driver_uninit(struct mic_driver *mdrv); void mic_driver_uninit(struct mic_driver *mdrv);
int mic_next_card_db(void); int mic_next_card_db(void);
struct mic_irq *mic_request_card_irq(irqreturn_t (*func)(int irq, void *data), struct mic_irq *mic_request_card_irq(irq_handler_t handler,
const char *name, void *data, int intr_src); irq_handler_t thread_fn, const char *name, void *data, int intr_src);
void mic_free_card_irq(struct mic_irq *cookie, void *data); void mic_free_card_irq(struct mic_irq *cookie, void *data);
u32 mic_read_spad(struct mic_device *mdev, unsigned int idx); u32 mic_read_spad(struct mic_device *mdev, unsigned int idx);
void mic_send_intr(struct mic_device *mdev, int doorbell); void mic_send_intr(struct mic_device *mdev, int doorbell);

7
drivers/misc/mic/card/mic_virtio.c
View file

@ -417,7 +417,7 @@ static int mic_add_device(struct mic_device_desc __iomem *d,
virtio_db = mic_next_card_db(); virtio_db = mic_next_card_db();
mvdev->virtio_cookie = mic_request_card_irq(mic_virtio_intr_handler, mvdev->virtio_cookie = mic_request_card_irq(mic_virtio_intr_handler,
"virtio intr", mvdev, virtio_db); NULL, "virtio intr", mvdev, virtio_db);
if (IS_ERR(mvdev->virtio_cookie)) { if (IS_ERR(mvdev->virtio_cookie)) {
ret = PTR_ERR(mvdev->virtio_cookie); ret = PTR_ERR(mvdev->virtio_cookie);
goto kfree; goto kfree;
@ -606,8 +606,9 @@ int mic_devices_init(struct mic_driver *mdrv)
mic_scan_devices(mdrv, !REMOVE_DEVICES); mic_scan_devices(mdrv, !REMOVE_DEVICES);
config_db = mic_next_card_db(); config_db = mic_next_card_db();
virtio_config_cookie = mic_request_card_irq(mic_extint_handler, virtio_config_cookie = mic_request_card_irq(mic_extint_handler, NULL,
"virtio_config_intr", mdrv, config_db); "virtio_config_intr", mdrv,
config_db);
if (IS_ERR(virtio_config_cookie)) { if (IS_ERR(virtio_config_cookie)) {
rc = PTR_ERR(virtio_config_cookie); rc = PTR_ERR(virtio_config_cookie);
goto exit; goto exit;