lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

staging: comedi: rtd520: factor out the pci latency quirk

Browse Source 
Factor the code that checks the pci latency timer out of rtd_attach().

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
H Hartley Sweeten
2012-10-29 10:02:03 -07:00
committed by Greg Kroah-Hartman
parent fd71190557
commit 3d7e44164c
1 changed files with 35 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
drivers/staging/comedi/drivers/rtd520.c
View File

@@ -1542,6 +1542,40 @@ static int rtd_dio_insn_config(struct comedi_device *dev,
return 1; return 1;
} }
/* The RTD driver does this */
static void rtd_pci_latency_quirk(struct comedi_device *dev,
struct pci_dev *pcidev)
{
unsigned char pci_latency;
u16 revision;
/*uint32_t epld_version; */
pci_read_config_word(pcidev, PCI_REVISION_ID, &revision);
DPRINTK("%s: PCI revision %d.\n", dev->board_name, revision);
pci_read_config_byte(pcidev, PCI_LATENCY_TIMER, &pci_latency);
if (pci_latency < 32) {
dev_info(dev->class_dev,
"PCI latency changed from %d to %d\n",
pci_latency, 32);
pci_write_config_byte(pcidev, PCI_LATENCY_TIMER, 32);
} else {
DPRINTK("rtd520: PCI latency = %d\n", pci_latency);
}
#if 0
/*
* Undocumented EPLD version (doesn't match RTD driver results)
*/
DPRINTK("rtd520: Reading epld from %p\n", devpriv->las0 + 0);
epld_version = readl(devpriv->las0 + 0);
if ((epld_version & 0xF0) >> 4 == 0x0F)
DPRINTK("rtd520: pre-v8 EPLD. (%x)\n", epld_version);
else
DPRINTK("rtd520: EPLD version %x.\n", epld_version >> 4);
#endif
}
static struct pci_dev *rtd_find_pci(struct comedi_device *dev, static struct pci_dev *rtd_find_pci(struct comedi_device *dev,
struct comedi_devconfig *it) struct comedi_devconfig *it)
{ {
@@ -1622,39 +1656,7 @@ static int rtd_attach(struct comedi_device *dev, struct comedi_devconfig *it)
if (!devpriv->las0 || !devpriv->las1 || !devpriv->lcfg) if (!devpriv->las0 || !devpriv->las1 || !devpriv->lcfg)
return -ENOMEM; return -ENOMEM;
{ /* The RTD driver does this */ rtd_pci_latency_quirk(dev, pcidev);
unsigned char pci_latency;
u16 revision;
/*uint32_t epld_version; */
pci_read_config_word(pcidev, PCI_REVISION_ID,
&revision);
DPRINTK("%s: PCI revision %d.\n", dev->board_name, revision);
pci_read_config_byte(pcidev,
PCI_LATENCY_TIMER, &pci_latency);
if (pci_latency < 32) {
dev_info(dev->class_dev,
"PCI latency changed from %d to %d\n",
pci_latency, 32);
pci_write_config_byte(pcidev,
PCI_LATENCY_TIMER, 32);
} else {
DPRINTK("rtd520: PCI latency = %d\n", pci_latency);
}
/*
* Undocumented EPLD version (doesn't match RTD driver results)
*/
/*DPRINTK ("rtd520: Reading epld from %p\n",
devpriv->las0+0);
epld_version = readl (devpriv->las0+0);
if ((epld_version & 0xF0) >> 4 == 0x0F) {
DPRINTK("rtd520: pre-v8 EPLD. (%x)\n", epld_version);
} else {
DPRINTK("rtd520: EPLD version %x.\n", epld_version >> 4);
} */
}
/* Show board configuration */ /* Show board configuration */
dev_info(dev->class_dev, "%s:", dev->board_name); dev_info(dev->class_dev, "%s:", dev->board_name);