Module Name: src
Committed By: kiyohara
Date: Sat Jan 7 14:44:26 UTC 2017
Modified Files:
src/sys/dev/marvell: gtidmac.c
Log Message:
Support Marvell Dove. Use irq array. Dove's irqs not sequencial.
And remove debug printf().
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/marvell/gtidmac.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/marvell/gtidmac.c
diff -u src/sys/dev/marvell/gtidmac.c:1.12 src/sys/dev/marvell/gtidmac.c:1.13
--- src/sys/dev/marvell/gtidmac.c:1.12 Sat Jan 7 14:36:51 2017
+++ src/sys/dev/marvell/gtidmac.c Sat Jan 7 14:44:26 2017
@@ -1,6 +1,6 @@
-/* $NetBSD: gtidmac.c,v 1.12 2017/01/07 14:36:51 kiyohara Exp $ */
+/* $NetBSD: gtidmac.c,v 1.13 2017/01/07 14:44:26 kiyohara Exp $ */
/*
- * Copyright (c) 2008, 2012 KIYOHARA Takashi
+ * Copyright (c) 2008, 2012, 2016 KIYOHARA Takashi
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gtidmac.c,v 1.12 2017/01/07 14:36:51 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gtidmac.c,v 1.13 2017/01/07 14:44:26 kiyohara Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -276,24 +276,30 @@ static const struct dmover_algdesc mvxor
},
};
+static int orion_88f5182_xore_irqs[] = { 30, 31 };
+static int kirkwood_xore_irqs[] = { 5, 6, 7, 8 };
+static int dove_xore_irqs[] = { 39, 40, 42, 43 };
+static int armadaxp_xore_irqs0[] = { 51, 52 };
+static int armadaxp_xore_irqs1[] = { 94, 95 };
+
static struct {
int model;
int idmac_nchan;
int idmac_irq;
int xore_nchan;
- int xore_irq;
+ int *xore_irqs;
} channels[] = {
/*
* Marvell System Controllers:
* need irqs in attach_args.
*/
- { MARVELL_DISCOVERY, 8, -1, 0, -1 },
- { MARVELL_DISCOVERY_II, 8, -1, 0, -1 },
- { MARVELL_DISCOVERY_III, 8, -1, 0, -1 },
+ { MARVELL_DISCOVERY, 8, -1, 0, NULL },
+ { MARVELL_DISCOVERY_II, 8, -1, 0, NULL },
+ { MARVELL_DISCOVERY_III, 8, -1, 0, NULL },
#if 0
- { MARVELL_DISCOVERY_LT, 4, -1, 2, -1 },
- { MARVELL_DISCOVERY_V, 4, -1, 2, -1 },
- { MARVELL_DISCOVERY_VI, 4, -1, 2, -1 }, ????
+ { MARVELL_DISCOVERY_LT, 4, -1, 2, NULL },
+ { MARVELL_DISCOVERY_V, 4, -1, 2, NULL },
+ { MARVELL_DISCOVERY_VI, 4, -1, 2, NULL }, ????
#endif
/*
@@ -301,28 +307,29 @@ static struct {
* No need irqs in attach_args. We always connecting to interrupt-pin
* statically.
*/
- { MARVELL_ORION_1_88F1181, 4, 24, 0, -1 },
- { MARVELL_ORION_2_88F1281, 4, 24, 0, -1 },
- { MARVELL_ORION_1_88F5082, 4, 24, 0, -1 },
- { MARVELL_ORION_1_88F5180N, 4, 24, 0, -1 },
- { MARVELL_ORION_1_88F5181, 4, 24, 0, -1 },
- { MARVELL_ORION_1_88F5182, 4, 24, 2, 30 },
- { MARVELL_ORION_2_88F5281, 4, 24, 0, -1 },
- { MARVELL_ORION_1_88W8660, 4, 24, 0, -1 },
- { MARVELL_KIRKWOOD_88F6180, 0, -1, 4, 5 },
- { MARVELL_KIRKWOOD_88F6192, 0, -1, 4, 5 },
- { MARVELL_KIRKWOOD_88F6281, 0, -1, 4, 5 },
- { MARVELL_KIRKWOOD_88F6282, 0, -1, 4, 5 },
- { MARVELL_ARMADAXP_MV78130, 4, 33, 2, 51 },
- { MARVELL_ARMADAXP_MV78130, 0, -1, 2, 94 },
- { MARVELL_ARMADAXP_MV78160, 4, 33, 2, 51 },
- { MARVELL_ARMADAXP_MV78160, 0, -1, 2, 94 },
- { MARVELL_ARMADAXP_MV78230, 4, 33, 2, 51 },
- { MARVELL_ARMADAXP_MV78230, 0, -1, 2, 94 },
- { MARVELL_ARMADAXP_MV78260, 4, 33, 2, 51 },
- { MARVELL_ARMADAXP_MV78260, 0, -1, 2, 94 },
- { MARVELL_ARMADAXP_MV78460, 4, 33, 2, 51 },
- { MARVELL_ARMADAXP_MV78460, 0, -1, 2, 94 },
+ { MARVELL_ORION_1_88F1181, 4, 24, 0, NULL },
+ { MARVELL_ORION_2_88F1281, 4, 24, 0, NULL },
+ { MARVELL_ORION_1_88F5082, 4, 24, 0, NULL },
+ { MARVELL_ORION_1_88F5180N, 4, 24, 0, NULL },
+ { MARVELL_ORION_1_88F5181, 4, 24, 0, NULL },
+ { MARVELL_ORION_1_88F5182, 4, 24, 2, orion_88f5182_xore_irqs },
+ { MARVELL_ORION_2_88F5281, 4, 24, 0, NULL },
+ { MARVELL_ORION_1_88W8660, 4, 24, 0, NULL },
+ { MARVELL_KIRKWOOD_88F6180, 0, -1, 4, kirkwood_xore_irqs },
+ { MARVELL_KIRKWOOD_88F6192, 0, -1, 4, kirkwood_xore_irqs },
+ { MARVELL_KIRKWOOD_88F6281, 0, -1, 4, kirkwood_xore_irqs },
+ { MARVELL_KIRKWOOD_88F6282, 0, -1, 4, kirkwood_xore_irqs },
+ { MARVELL_DOVE_88AP510, 0, -1, 4, dove_xore_irqs },
+ { MARVELL_ARMADAXP_MV78130, 4, 33, 2, armadaxp_xore_irqs0 },
+ { MARVELL_ARMADAXP_MV78130, 0, -1, 2, armadaxp_xore_irqs1 },
+ { MARVELL_ARMADAXP_MV78160, 4, 33, 2, armadaxp_xore_irqs0 },
+ { MARVELL_ARMADAXP_MV78160, 0, -1, 2, armadaxp_xore_irqs1 },
+ { MARVELL_ARMADAXP_MV78230, 4, 33, 2, armadaxp_xore_irqs0 },
+ { MARVELL_ARMADAXP_MV78230, 0, -1, 2, armadaxp_xore_irqs1 },
+ { MARVELL_ARMADAXP_MV78260, 4, 33, 2, armadaxp_xore_irqs0 },
+ { MARVELL_ARMADAXP_MV78260, 0, -1, 2, armadaxp_xore_irqs1 },
+ { MARVELL_ARMADAXP_MV78460, 4, 33, 2, armadaxp_xore_irqs0 },
+ { MARVELL_ARMADAXP_MV78460, 0, -1, 2, armadaxp_xore_irqs1 },
};
struct gtidmac_winacctbl *gtidmac_winacctbl;
@@ -364,7 +371,7 @@ gtidmac_attach(device_t parent, device_t
struct gtidmac_softc *sc = device_private(self);
struct marvell_attach_args *mva = aux;
prop_dictionary_t dict = device_properties(self);
- uint32_t idmac_irq, xore_irq, dmb_speed;
+ uint32_t idmac_irq, xore_irq, *xore_irqs, dmb_speed;
int unit, idmac_nchan, xore_nchan, nsegs, i, j, n;
unit = 0;
@@ -388,11 +395,12 @@ gtidmac_attach(device_t parent, device_t
}
}
xore_nchan = channels[i].xore_nchan;
- xore_irq = channels[i].xore_irq;
+ xore_irqs = channels[i].xore_irqs;
+ xore_irq = MVA_IRQ_DEFAULT;
if (xore_nchan != 0) {
- if (xore_irq == -1)
+ if (xore_irqs == NULL)
xore_irq = mva->mva_irq;
- if (xore_irq == -1)
+ if (xore_irqs == NULL && xore_irq == MVA_IRQ_DEFAULT)
/* Discovery LT/V/VI */
if (!prop_dictionary_get_uint32(dict,
"xore-irq", &xore_irq)) {
@@ -408,10 +416,18 @@ gtidmac_attach(device_t parent, device_t
aprint_normal_dev(self,
"IDMA Controller %d channels, intr %d...%d\n",
idmac_nchan, idmac_irq, idmac_irq + GTIDMAC_NINTRRUPT - 1);
- if (xore_nchan > 0)
- aprint_normal_dev(self,
- "XOR Engine %d channels, intr %d...%d\n",
- xore_nchan, xore_irq, xore_irq + xore_nchan - 1);
+ if (xore_nchan > 0) {
+ aprint_normal_dev(self, "XOR Engine %d channels", xore_nchan);
+ if (xore_irqs == NULL)
+ aprint_normal(", intr %d...%d\n",
+ xore_irq, xore_irq + xore_nchan - 1);
+ else {
+ aprint_normal(", intr %d", xore_irqs[0]);
+ for (i = 1; i < xore_nchan; i++)
+ aprint_normal(", %d", xore_irqs[i]);
+ aprint_normal("\n");
+ }
+ }
sc->sc_dev = self;
sc->sc_iot = mva->mva_iot;
@@ -496,7 +512,9 @@ gtidmac_attach(device_t parent, device_t
/* Setup interrupt */
for (i = 0; i < sc->sc_mvxore_nchan; i++)
- marvell_intr_establish(xore_irq + i, IPL_BIO,
+ marvell_intr_establish(
+ xore_irqs != NULL ? xore_irqs[i] : xore_irq + i,
+ IPL_BIO,
(i & 0x2) ? mvxore_port1_intr : mvxore_port0_intr,
sc);
@@ -507,8 +525,7 @@ gtidmac_attach(device_t parent, device_t
sc->sc_dmb_xore.dmb_speed = dmb_speed;
sc->sc_dmb_xore.dmb_cookie = sc;
sc->sc_dmb_xore.dmb_algdescs = mvxore_algdescs;
- sc->sc_dmb_xore.dmb_nalgdescs =
- __arraycount(mvxore_algdescs);
+ sc->sc_dmb_xore.dmb_nalgdescs = __arraycount(mvxore_algdescs);
sc->sc_dmb_xore.dmb_process = gtidmac_process;
dmover_backend_register(&sc->sc_dmb_xore);
}
@@ -635,7 +652,6 @@ mvxore_intr(struct gtidmac_softc *sc, in
cause =
bus_space_read_4(sc->sc_iot, sc->sc_ioh, MVXORE_XEICR(sc, port));
DPRINTF(("XORE port %d intr: cause=0x%x\n", port, cause));
-printf("XORE port %d intr: cause=0x%x\n", port, cause);
bus_space_write_4(sc->sc_iot, sc->sc_ioh,
MVXORE_XEICR(sc, port), ~cause);
@@ -703,7 +719,6 @@ printf("XORE port %d intr: cause=0x%x\n"
cause >>= MVXORE_I_BITS;
}
-printf("XORE port %d intr: %shandled\n", port, handled ? "" : "not ");
DPRINTF(("XORE port %d intr: %shandled\n",
port, handled ? "" : "not "));
@@ -770,7 +785,8 @@ gtidmac_dmover_run(struct dmover_backend
BUS_DMA_NOWAIT | BUS_DMA_STREAMING | BUS_DMA_WRITE);
if (error == 0) {
bus_dmamap_sync(sc->sc_dmat, *dmamap_in, 0,
- sizeof(uint32_t), BUS_DMASYNC_PREWRITE);
+ sizeof(sc->sc_pbuf[pno]),
+ BUS_DMASYNC_PREWRITE);
/*
* We will call gtidmac_dmmap_unload() when
@@ -1244,10 +1260,9 @@ mvxore_setup(void *tag, int chan, int ni
int iidx[MVXORE_NSRC] = { 0, 0, 0, 0, 0, 0, 0, 0 }, oidx = 0;
#ifdef DIAGNOSTIC
- uint32_t xexact;
-
- xexact =
+ uint32_t xexact =
bus_space_read_4(sc->sc_iot, sc->sc_ioh, MVXORE_XEXACTR(sc, chan));
+
if ((xexact & MVXORE_XEXACTR_XESTATUS_MASK) ==
MVXORE_XEXACTR_XESTATUS_ACT)
panic("mvxore_setup: chan%d already active."
