Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9c3d37c7 authored by Siva Yerramreddy's avatar Siva Yerramreddy Committed by Greg Kroah-Hartman
Browse files

misc: mic: add threaded irq support in card driver 



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

Reviewed-by: default avatarAshutosh Dixit <ashutosh.dixit@intel.com>
Reviewed-by: default avatarNikhil Rao <nikhil.rao@intel.com>
Reviewed-by: default avatarSudeep Dutt <sudeep.dutt@intel.com>
Signed-off-by: default avatarSiva Yerramreddy <yshivakrishna@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d4ef098e

drivers/misc/mic/card/mic_device.c

+13 −10
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ static int mic_shutdown_init(void) 
	int shutdown_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);

	if (IS_ERR(shutdown_cookie))

		rc = PTR_ERR(shutdown_cookie);
@@ -136,7 +136,8 @@ static void mic_dp_uninit(void) 
/**

 * 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.

 * @data: private data that is returned back when calling the

 * function handler.
@@ -149,17 +150,19 @@ static void mic_dp_uninit(void) 
 * error code.

 *

 */

struct mic_irq *mic_request_card_irq(irqreturn_t (*func)(int irq, void *data),

	const char *name, void *data, int index)

struct mic_irq *

mic_request_card_irq(irq_handler_t handler,

		     irq_handler_t thread_fn, const char *name,

		     void *data, int index)

{

	int rc = 0;

	unsigned long cookie;

	struct mic_driver *mdrv = g_drv;



	rc  = request_irq(mic_db_to_irq(mdrv, index), func,

		0, name, data);

	rc  = request_threaded_irq(mic_db_to_irq(mdrv, index), handler,

				   thread_fn, 0, name, data);

	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;

	}

	mdrv->irq_info.irq_usage_count[index]++;
@@ -172,9 +175,9 @@ err: 
/**

 * 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

 * mic_request_irq

 * mic_request_threaded_irq

 *

 * returns: none.

 */

drivers/misc/mic/card/mic_device.h

+3 −2
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
#include <linux/workqueue.h>

#include <linux/io.h>

#include <linux/irqreturn.h>

#include <linux/interrupt.h>



/**

 * 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);

void mic_driver_uninit(struct mic_driver *mdrv);

int mic_next_card_db(void);

struct mic_irq *mic_request_card_irq(irqreturn_t (*func)(int irq, void *data),

	const char *name, void *data, int intr_src);

struct mic_irq *mic_request_card_irq(irq_handler_t handler,

	irq_handler_t thread_fn, const char *name, void *data, int intr_src);

void mic_free_card_irq(struct mic_irq *cookie, void *data);

u32 mic_read_spad(struct mic_device *mdev, unsigned int idx);

void mic_send_intr(struct mic_device *mdev, int doorbell);

drivers/misc/mic/card/mic_virtio.c

+4 −3
Original line number Diff line number Diff line
@@ -417,7 +417,7 @@ static int mic_add_device(struct mic_device_desc __iomem *d, 


	virtio_db = mic_next_card_db();

	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)) {

		ret = PTR_ERR(mvdev->virtio_cookie);

		goto kfree;
@@ -606,8 +606,9 @@ int mic_devices_init(struct mic_driver *mdrv) 
	mic_scan_devices(mdrv, !REMOVE_DEVICES);



	config_db = mic_next_card_db();

	virtio_config_cookie = mic_request_card_irq(mic_extint_handler,

			"virtio_config_intr", mdrv, config_db);

	virtio_config_cookie = mic_request_card_irq(mic_extint_handler, NULL,

						    "virtio_config_intr", mdrv,

						    config_db);

	if (IS_ERR(virtio_config_cookie)) {

		rc = PTR_ERR(virtio_config_cookie);

		goto exit;