Commit 43874181 authored by Oliver Endriss's avatar Oliver Endriss Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB: ngene: Implement support for MSI 



Add MSI support, may be enabled with firmware version 18.

Signed-off-by: default avatarOliver Endriss <o.endriss@gmx.de>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent eb05d155

drivers/media/dvb/ngene/ngene-core.c

+32 −1
Original line number Diff line number Diff line
@@ -1299,11 +1299,14 @@ static void ngene_stop(struct ngene *dev) 
	ngwritel(0, NGENE_EVENT);

	ngwritel(0, NGENE_EVENT_HI);

	free_irq(dev->pci_dev->irq, dev);

	if (dev->msi_enabled)

		pci_disable_msi(dev->pci_dev);

}



static int ngene_start(struct ngene *dev)

{

	int stat;

	unsigned long flags;

	int i;



	pci_set_master(dev->pci_dev);
@@ -1333,6 +1336,28 @@ static int ngene_start(struct ngene *dev) 
	if (stat < 0)

		goto fail;



#ifdef CONFIG_PCI_MSI

	/* enable MSI if kernel and card support it */

	if (dev->card_info->msi_supported) {

		ngwritel(0, NGENE_INT_ENABLE);

		free_irq(dev->pci_dev->irq, dev);

		stat = pci_enable_msi(dev->pci_dev);

		if (stat) {

			printk(KERN_INFO DEVICE_NAME

				": MSI not available\n");

			flags = IRQF_SHARED;

		} else {

			flags = 0;

			dev->msi_enabled = true;

		}

		stat = request_irq(dev->pci_dev->irq, irq_handler,

					flags, "nGene", dev);

		if (stat < 0)

			goto fail2;

		ngwritel(1, NGENE_INT_ENABLE);

	}

#endif



	stat = ngene_i2c_init(dev, 0);

	if (stat < 0)

		goto fail;
@@ -1358,10 +1383,16 @@ static int ngene_start(struct ngene *dev) 
			bconf = BUFFER_CONFIG_3333;

		stat = ngene_command_config_buf(dev, bconf);

	}

	if (!stat)

		return stat;



	/* otherwise error: fall through */

fail:

	ngwritel(0, NGENE_INT_ENABLE);

	free_irq(dev->pci_dev->irq, dev);

fail2:

	if (dev->msi_enabled)

		pci_disable_msi(dev->pci_dev);

	return stat;

}

drivers/media/dvb/ngene/ngene.h

+2 −0
Original line number Diff line number Diff line
@@ -725,6 +725,7 @@ struct ngene { 
	u32                   device_version;

	u32                   fw_interface_version;

	u32                   icounts;

	bool                  msi_enabled;



	u8                   *CmdDoneByte;

	int                   BootFirmware;
@@ -797,6 +798,7 @@ struct ngene_info { 
#define NGENE_VBOX_V2	 7



	int   fw_version;

	bool  msi_supported;

	char *name;



	int   io_type[MAX_STREAM];