Char: cyclades, load firmware even on Ze
PATCH 1/3 Char: cyclades, load firmware even on Ze
Ze needs firmware to be loaded as well as Zo. Move cyz_load_fw one level upper to achieve that.
Signed-off-by Jiri Slaby <[email protected]>
--- drivers/char/cyclades.c | 13 +++++-------- 1 files changed, 5 insertions(+), 8 deletions(-)
drivers/char/cyclades.c +5 -8
@@ -5043,6 +5043,7 @@ static int __devinit cy_pci_probe(struct pci_dev *pdev, nchan =ZE_V1_NPORTS ; }else { card_name ="Cyclades-8Zo" ; + nchan =8 ;#ifdef CY_PCI_DEBUG if (mailbox ==ZO_V1 ) {
@@ -5065,15 +5066,11 @@ static int __devinit cy_pci_probe(struct pci_dev *pdev,*/ if ((mailbox ==ZO_V1 ) || (mailbox ==ZO_V2 ))cy_writel (addr2 +ID_ADDRESS ,0L ); - - retval =cyz_load_fw (pdev, addr2, addr0, irq); -if (retval) - goto err_unmap; -/* This must be a Cyclades-8Zo/PCI. The extendable -version will have a different device_id and will -be allocated its maximum number of ports. */ - nchan =8 ; } + + retval =cyz_load_fw (pdev, addr2, addr0, irq); +if (retval) + goto err_unmap; }if ((cy_next_channel + nchan) >NR_PORTS ) {
Signature · 1 line
1.6.2
PATCH 2/3 Char: cyclades, don't kill FW
Don't reset the PLX chip after FW load, which effectively kills the FW, so that user had to boot manually.
Signed-off-by Jiri Slaby <[email protected]>
--- drivers/char/cyclades.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-)
drivers/char/cyclades.c +0 -2
@@ -4932,8 +4932,6 @@ static int __devinit cyz_load_fw(struct pci_dev *pdev, void __iomem *base_addr,cy_writel (&ctl_addr->intr_ctrl_stat,readl (&ctl_addr->intr_ctrl_stat) |0x00030800UL ); -plx_init (pdev, irq, ctl_addr); -return 0 ; err_rel:release_firmware (fw);
Signature · 1 line
1.6.2
PATCH 3/3 Char: cyclades, remove spurious check in ISR
In reply to Jiri SlabyNo need to check if dev_id is NULL, it never is.
Signed-off-by Jiri Slaby <[email protected]>
--- drivers/char/cyclades.c | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-)
drivers/char/cyclades.c +0 -8
@@ -1737,14 +1737,6 @@ static irqreturn_t cyz_interrupt(int irq, void *dev_id) {struct cyclades_card *cinfo = dev_id; -if (unlikely (cinfo ==NULL )) { -#ifdef CY_DEBUG_INTERRUPTS -printk (KERN_DEBUG "cyz_interrupt: spurious interrupt %d\n" , - irq); -#endif -return IRQ_NONE ;/* spurious interrupt */ - } -if (unlikely (!ISZLOADED (*cinfo))) {#ifdef CY_DEBUG_INTERRUPTS printk(KERN_DEBUG "cyz_interrupt: board not yet loaded "
Signature · 1 line
1.6.2