Commit 18c565eb authored by David S. Miller's avatar David S. Miller

Merge branch 'defxx-next'

Maciej W. Rozycki says:

====================
defxx: DEFEA fixes and updates

 I have finally got my hands on an EISA variation of the board (DEC
FDDIcontroller/EISA aka DEFEA) and was able to do some testing.  Here are
initial updates to the driver that address problems I encountered so far.
More to come later on as I get back to the system that I have in a remote
location -- I need to double-check MMIO support and see what might have
been causing spurious interrupts I saw with the 8259A PIC the board's
interrupt line has been routed to.
====================
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents f5c7e1a4 b98dfaf2
...@@ -466,7 +466,8 @@ static void dfx_get_bars(struct device *bdev, ...@@ -466,7 +466,8 @@ static void dfx_get_bars(struct device *bdev,
*bar_len = (bar | PI_MEM_ADD_MASK_M) + 1; *bar_len = (bar | PI_MEM_ADD_MASK_M) + 1;
} else { } else {
*bar_start = base_addr; *bar_start = base_addr;
*bar_len = PI_ESIC_K_CSR_IO_LEN; *bar_len = PI_ESIC_K_CSR_IO_LEN +
PI_ESIC_K_BURST_HOLDOFF_LEN;
} }
} }
if (dfx_bus_tc) { if (dfx_bus_tc) {
...@@ -683,6 +684,9 @@ static void dfx_bus_init(struct net_device *dev) ...@@ -683,6 +684,9 @@ static void dfx_bus_init(struct net_device *dev)
if (dfx_bus_eisa) { if (dfx_bus_eisa) {
unsigned long base_addr = to_eisa_device(bdev)->base_addr; unsigned long base_addr = to_eisa_device(bdev)->base_addr;
/* Disable the board before fiddling with the decoders. */
outb(0, base_addr + PI_ESIC_K_SLOT_CNTRL);
/* Get the interrupt level from the ESIC chip. */ /* Get the interrupt level from the ESIC chip. */
val = inb(base_addr + PI_ESIC_K_IO_CONFIG_STAT_0); val = inb(base_addr + PI_ESIC_K_IO_CONFIG_STAT_0);
val &= PI_CONFIG_STAT_0_M_IRQ; val &= PI_CONFIG_STAT_0_M_IRQ;
...@@ -709,38 +713,46 @@ static void dfx_bus_init(struct net_device *dev) ...@@ -709,38 +713,46 @@ static void dfx_bus_init(struct net_device *dev)
/* /*
* Enable memory decoding (MEMCS0) and/or port decoding * Enable memory decoding (MEMCS0) and/or port decoding
* (IOCS1/IOCS0) as appropriate in Function Control * (IOCS1/IOCS0) as appropriate in Function Control
* Register. One of the port chip selects seems to be * Register. IOCS0 is used for PDQ registers, taking 16
* used for the Burst Holdoff register, but this bit of * 32-bit words, while IOCS1 is used for the Burst Holdoff
* documentation is missing and as yet it has not been * register, taking a single 32-bit word only. We use the
* determined which of the two. This is also the reason * slot-specific I/O range as per the ESIC spec, that is
* the size of the decoded port range is twice as large * set bits 15:12 in the mask registers to mask them out.
* as one required by the PDQ.
*/ */
/* Set the decode range of the board. */ /* Set the decode range of the board. */
val = ((bp->base.port >> 12) << PI_IO_CMP_V_SLOT); val = 0;
outb(base_addr + PI_ESIC_K_IO_ADD_CMP_0_1, val); outb(val, base_addr + PI_ESIC_K_IO_ADD_CMP_0_1);
outb(base_addr + PI_ESIC_K_IO_ADD_CMP_0_0, 0); val = PI_DEFEA_K_CSR_IO;
outb(base_addr + PI_ESIC_K_IO_ADD_CMP_1_1, val); outb(val, base_addr + PI_ESIC_K_IO_ADD_CMP_0_0);
outb(base_addr + PI_ESIC_K_IO_ADD_CMP_1_0, 0);
val = PI_ESIC_K_CSR_IO_LEN - 1; val = PI_IO_CMP_M_SLOT;
outb(base_addr + PI_ESIC_K_IO_ADD_MASK_0_1, (val >> 8) & 0xff); outb(val, base_addr + PI_ESIC_K_IO_ADD_MASK_0_1);
outb(base_addr + PI_ESIC_K_IO_ADD_MASK_0_0, val & 0xff); val = (PI_ESIC_K_CSR_IO_LEN - 1) & ~3;
outb(base_addr + PI_ESIC_K_IO_ADD_MASK_1_1, (val >> 8) & 0xff); outb(val, base_addr + PI_ESIC_K_IO_ADD_MASK_0_0);
outb(base_addr + PI_ESIC_K_IO_ADD_MASK_1_0, val & 0xff);
val = 0;
outb(val, base_addr + PI_ESIC_K_IO_ADD_CMP_1_1);
val = PI_DEFEA_K_BURST_HOLDOFF;
outb(val, base_addr + PI_ESIC_K_IO_ADD_CMP_1_0);
val = PI_IO_CMP_M_SLOT;
outb(val, base_addr + PI_ESIC_K_IO_ADD_MASK_1_1);
val = (PI_ESIC_K_BURST_HOLDOFF_LEN - 1) & ~3;
outb(val, base_addr + PI_ESIC_K_IO_ADD_MASK_1_0);
/* Enable the decoders. */ /* Enable the decoders. */
val = PI_FUNCTION_CNTRL_M_IOCS1 | PI_FUNCTION_CNTRL_M_IOCS0; val = PI_FUNCTION_CNTRL_M_IOCS1 | PI_FUNCTION_CNTRL_M_IOCS0;
if (dfx_use_mmio) if (dfx_use_mmio)
val |= PI_FUNCTION_CNTRL_M_MEMCS0; val |= PI_FUNCTION_CNTRL_M_MEMCS0;
outb(base_addr + PI_ESIC_K_FUNCTION_CNTRL, val); outb(val, base_addr + PI_ESIC_K_FUNCTION_CNTRL);
/* /*
* Enable access to the rest of the module * Enable access to the rest of the module
* (including PDQ and packet memory). * (including PDQ and packet memory).
*/ */
val = PI_SLOT_CNTRL_M_ENB; val = PI_SLOT_CNTRL_M_ENB;
outb(base_addr + PI_ESIC_K_SLOT_CNTRL, val); outb(val, base_addr + PI_ESIC_K_SLOT_CNTRL);
/* /*
* Map PDQ registers into memory or port space. This is * Map PDQ registers into memory or port space. This is
...@@ -748,15 +760,15 @@ static void dfx_bus_init(struct net_device *dev) ...@@ -748,15 +760,15 @@ static void dfx_bus_init(struct net_device *dev)
*/ */
val = inb(base_addr + PI_DEFEA_K_BURST_HOLDOFF); val = inb(base_addr + PI_DEFEA_K_BURST_HOLDOFF);
if (dfx_use_mmio) if (dfx_use_mmio)
val |= PI_BURST_HOLDOFF_V_MEM_MAP; val |= PI_BURST_HOLDOFF_M_MEM_MAP;
else else
val &= ~PI_BURST_HOLDOFF_V_MEM_MAP; val &= ~PI_BURST_HOLDOFF_M_MEM_MAP;
outb(base_addr + PI_DEFEA_K_BURST_HOLDOFF, val); outb(val, base_addr + PI_DEFEA_K_BURST_HOLDOFF);
/* Enable interrupts at EISA bus interface chip (ESIC) */ /* Enable interrupts at EISA bus interface chip (ESIC) */
val = inb(base_addr + PI_ESIC_K_IO_CONFIG_STAT_0); val = inb(base_addr + PI_ESIC_K_IO_CONFIG_STAT_0);
val |= PI_CONFIG_STAT_0_M_INT_ENB; val |= PI_CONFIG_STAT_0_M_INT_ENB;
outb(base_addr + PI_ESIC_K_IO_CONFIG_STAT_0, val); outb(val, base_addr + PI_ESIC_K_IO_CONFIG_STAT_0);
} }
if (dfx_bus_pci) { if (dfx_bus_pci) {
struct pci_dev *pdev = to_pci_dev(bdev); struct pci_dev *pdev = to_pci_dev(bdev);
...@@ -825,7 +837,7 @@ static void dfx_bus_uninit(struct net_device *dev) ...@@ -825,7 +837,7 @@ static void dfx_bus_uninit(struct net_device *dev)
/* Disable interrupts at EISA bus interface chip (ESIC) */ /* Disable interrupts at EISA bus interface chip (ESIC) */
val = inb(base_addr + PI_ESIC_K_IO_CONFIG_STAT_0); val = inb(base_addr + PI_ESIC_K_IO_CONFIG_STAT_0);
val &= ~PI_CONFIG_STAT_0_M_INT_ENB; val &= ~PI_CONFIG_STAT_0_M_INT_ENB;
outb(base_addr + PI_ESIC_K_IO_CONFIG_STAT_0, val); outb(val, base_addr + PI_ESIC_K_IO_CONFIG_STAT_0);
} }
if (dfx_bus_pci) { if (dfx_bus_pci) {
/* Disable interrupts at PCI bus interface chip (PFI) */ /* Disable interrupts at PCI bus interface chip (PFI) */
...@@ -1917,7 +1929,7 @@ static irqreturn_t dfx_interrupt(int irq, void *dev_id) ...@@ -1917,7 +1929,7 @@ static irqreturn_t dfx_interrupt(int irq, void *dev_id)
/* Disable interrupts at the ESIC */ /* Disable interrupts at the ESIC */
status &= ~PI_CONFIG_STAT_0_M_INT_ENB; status &= ~PI_CONFIG_STAT_0_M_INT_ENB;
outb(base_addr + PI_ESIC_K_IO_CONFIG_STAT_0, status); outb(status, base_addr + PI_ESIC_K_IO_CONFIG_STAT_0);
/* Call interrupt service routine for this adapter */ /* Call interrupt service routine for this adapter */
dfx_int_common(dev); dfx_int_common(dev);
...@@ -1925,7 +1937,7 @@ static irqreturn_t dfx_interrupt(int irq, void *dev_id) ...@@ -1925,7 +1937,7 @@ static irqreturn_t dfx_interrupt(int irq, void *dev_id)
/* Reenable interrupts at the ESIC */ /* Reenable interrupts at the ESIC */
status = inb(base_addr + PI_ESIC_K_IO_CONFIG_STAT_0); status = inb(base_addr + PI_ESIC_K_IO_CONFIG_STAT_0);
status |= PI_CONFIG_STAT_0_M_INT_ENB; status |= PI_CONFIG_STAT_0_M_INT_ENB;
outb(base_addr + PI_ESIC_K_IO_CONFIG_STAT_0, status); outb(status, base_addr + PI_ESIC_K_IO_CONFIG_STAT_0);
spin_unlock(&bp->lock); spin_unlock(&bp->lock);
} }
......
...@@ -1479,8 +1479,10 @@ typedef union ...@@ -1479,8 +1479,10 @@ typedef union
/* Define EISA controller register offsets */ /* Define EISA controller register offsets */
#define PI_ESIC_K_CSR_IO_LEN 0x80 /* 128 bytes */ #define PI_ESIC_K_CSR_IO_LEN 0x40 /* 64 bytes */
#define PI_ESIC_K_BURST_HOLDOFF_LEN 0x04 /* 4 bytes */
#define PI_DEFEA_K_CSR_IO 0x000
#define PI_DEFEA_K_BURST_HOLDOFF 0x040 #define PI_DEFEA_K_BURST_HOLDOFF 0x040
#define PI_ESIC_K_SLOT_ID 0xC80 #define PI_ESIC_K_SLOT_ID 0xC80
...@@ -1558,11 +1560,9 @@ typedef union ...@@ -1558,11 +1560,9 @@ typedef union
#define PI_MEM_ADD_MASK_M 0x3ff #define PI_MEM_ADD_MASK_M 0x3ff
/* /* Define the fields in the I/O Address Compare and Mask registers. */
* Define the fields in the IO Compare registers.
* The driver must initialize the slot field with the slot ID shifted by the #define PI_IO_CMP_M_SLOT 0xf0
* amount shown below.
*/
#define PI_IO_CMP_V_SLOT 4 #define PI_IO_CMP_V_SLOT 4
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment