Skip to content

Commit

Permalink
[media] ngene: Shutdown workaround
Browse files Browse the repository at this point in the history
Implement shutdown workaround for some chipsets.

Signed-off-by: Ralph Metzler <rjkm@metzlerbros.de>
Signed-off-by: Oliver Endriss <o.endriss@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Ralph Metzler authored and Mauro Carvalho Chehab committed Mar 21, 2011
1 parent 0f0b270 commit 1b7c41e
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 0 deletions.
1 change: 1 addition & 0 deletions drivers/media/dvb/ngene/ngene-cards.c
Original file line number Diff line number Diff line change
Expand Up @@ -436,6 +436,7 @@ static struct pci_driver ngene_pci_driver = {
.probe = ngene_probe,
.remove = __devexit_p(ngene_remove),
.err_handler = &ngene_errors,
.shutdown = ngene_shutdown,
};

static __init int module_init_ngene(void)
Expand Down
37 changes: 37 additions & 0 deletions drivers/media/dvb/ngene/ngene-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,10 @@ static int one_adapter = 1;
module_param(one_adapter, int, 0444);
MODULE_PARM_DESC(one_adapter, "Use only one adapter.");

static int shutdown_workaround;
module_param(shutdown_workaround, int, 0644);
MODULE_PARM_DESC(one_adapter, "Activate workaround for shutdown problem with some chipsets.");

static int debug;
module_param(debug, int, 0444);
MODULE_PARM_DESC(debug, "Print debugging information.");
Expand Down Expand Up @@ -1574,6 +1578,39 @@ static void cxd_detach(struct ngene *dev)
ci->en = 0;
}

/***********************************/
/* workaround for shutdown failure */
/***********************************/

static void ngene_unlink(struct ngene *dev)
{
struct ngene_command com;

com.cmd.hdr.Opcode = CMD_MEM_WRITE;
com.cmd.hdr.Length = 3;
com.cmd.MemoryWrite.address = 0x910c;
com.cmd.MemoryWrite.data = 0xff;
com.in_len = 3;
com.out_len = 1;

down(&dev->cmd_mutex);
ngwritel(0, NGENE_INT_ENABLE);
ngene_command_mutex(dev, &com);
up(&dev->cmd_mutex);
}

void ngene_shutdown(struct pci_dev *pdev)
{
struct ngene *dev = (struct ngene *)pci_get_drvdata(pdev);

if (!dev || !shutdown_workaround)
return;

printk(KERN_INFO DEVICE_NAME ": shutdown workaround...\n");
ngene_unlink(dev);
pci_disable_device(pdev);
}

/****************************************************************************/
/* device probe/remove calls ************************************************/
/****************************************************************************/
Expand Down
1 change: 1 addition & 0 deletions drivers/media/dvb/ngene/ngene.h
Original file line number Diff line number Diff line change
Expand Up @@ -881,6 +881,7 @@ struct ngene_buffer {
int __devinit ngene_probe(struct pci_dev *pci_dev,
const struct pci_device_id *id);
void __devexit ngene_remove(struct pci_dev *pdev);
void ngene_shutdown(struct pci_dev *pdev);
int ngene_command(struct ngene *dev, struct ngene_command *com);
int ngene_command_gpio_set(struct ngene *dev, u8 select, u8 level);
void set_transfer(struct ngene_channel *chan, int state);
Expand Down

0 comments on commit 1b7c41e

Please sign in to comment.