[Linux1394-cvslog] rev 810 - branches/linux-2.4
Brought to you by:
aeb,
bencollins
Menu
▾
▴
[Linux1394-cvslog] rev 810 - branches/linux-2.4
|
From: SVN U. <dm...@li...> - 2003-03-01 01:48:16
|
Author: dmaas
Date: 2003-02-28 20:47:27 -0500 (Fri, 28 Feb 2003)
New Revision: 810
Modified:
branches/linux-2.4/ieee1394.h
branches/linux-2.4/ohci1394.c
branches/linux-2.4/ohci1394.h
Log:
sync ohci1394 as much as possible with trunk
Modified: branches/linux-2.4/ohci1394.c
==============================================================================
--- branches/linux-2.4/ohci1394.c (original)
+++ branches/linux-2.4/ohci1394.c 2003-02-28 20:47:29.000000000 -0500
@@ -182,12 +182,6 @@
static void ohci1394_pci_remove(struct pci_dev *pdev);
#ifndef __LITTLE_ENDIAN
-/* Swap a series of quads inplace. */
-static __inline__ void block_swab32(quadlet_t *data, size_t size) {
- while (size--)
- data[size] = swab32(data[size]);
-}
-
static unsigned hdr_sizes[] =
{
3, /* TCODE_WRITEQ */
@@ -205,16 +199,19 @@
};
/* Swap headers */
-static inline void packet_swab(quadlet_t *data, int tcode, int len)
+static inline void packet_swab(quadlet_t *data, int tcode)
{
+ size_t size = hdr_sizes[tcode];
+
if (tcode > TCODE_LOCK_RESPONSE || hdr_sizes[tcode] == 0)
return;
- block_swab32(data, hdr_sizes[tcode]);
+
+ while (size--)
+ data[size] = swab32(data[size]);
}
#else
/* Don't waste cycles on same sex byte swaps */
-#define packet_swab(w,x,y)
-#define block_swab32(x,y)
+#define packet_swab(w,x)
#endif /* !LITTLE_ENDIAN */
/***********************************
@@ -323,7 +320,7 @@
/* SelfID Ok, reset error counter. */
ohci->self_id_errors = 0;
-
+
size = ((self_id_count & 0x00001FFC) >> 2) - 1;
q++;
@@ -387,12 +384,12 @@
"Running dma failed because Node ID == 63");
return -1;
}
-
+
/* Run the dma context */
reg_write(ohci, reg, 0x8000);
-
+
if (msg) PRINT(KERN_DEBUG, ohci->id, "%s", msg);
-
+
return 0;
}
@@ -406,11 +403,11 @@
for (i=0; i<d->num_desc; i++) {
u32 c;
-
+
c = DMA_CTL_INPUT_MORE | DMA_CTL_UPDATE | DMA_CTL_BRANCH;
if (generate_irq)
c |= DMA_CTL_IRQ;
-
+
d->prg_cpu[i]->control = cpu_to_le32(c | d->buf_size);
/* End of descriptor list? */
@@ -487,7 +484,7 @@
reg_write(ohci, reg, 0xffffffff);
tmp = reg_read(ohci, reg);
-
+
DBGMSG(ohci->id,"Iso contexts reg: %08x implemented: %08x", reg, tmp);
/* Count the number of contexts */
@@ -585,7 +582,8 @@
reg_write(ohci, OHCI1394_HCControlClear, 0x40000000);
/* Enable interrupts */
- reg_write(ohci, OHCI1394_IntMaskSet,
+ reg_write(ohci, OHCI1394_IntMaskSet,
+ OHCI1394_unrecoverableError |
OHCI1394_masterIntEnable |
OHCI1394_busReset |
OHCI1394_selfIDComplete |
@@ -653,19 +651,31 @@
} else {
d->prg_cpu[idx]->data[0] = packet->speed_code<<16 |
(packet->header[0] & 0xFFFF);
- d->prg_cpu[idx]->data[1] =
- (packet->header[1] & 0xFFFF) |
- (packet->header[0] & 0xFFFF0000);
- d->prg_cpu[idx]->data[2] = packet->header[2];
- d->prg_cpu[idx]->data[3] = packet->header[3];
- packet_swab(d->prg_cpu[idx]->data, packet->tcode,
- packet->header_size>>2);
+
+ if (packet->tcode == TCODE_ISO_DATA) {
+ /* Sending an async stream packet */
+ d->prg_cpu[idx]->data[1] = packet->header[0] & 0xFFFF0000;
+ } else {
+ /* Sending a normal async request or response */
+ d->prg_cpu[idx]->data[1] =
+ (packet->header[1] & 0xFFFF) |
+ (packet->header[0] & 0xFFFF0000);
+ d->prg_cpu[idx]->data[2] = packet->header[2];
+ d->prg_cpu[idx]->data[3] = packet->header[3];
+ }
+ packet_swab(d->prg_cpu[idx]->data, packet->tcode);
}
if (packet->data_size) { /* block transmit */
- d->prg_cpu[idx]->begin.control =
- cpu_to_le32(DMA_CTL_OUTPUT_MORE |
- DMA_CTL_IMMEDIATE | 0x10);
+ if (packet->tcode == TCODE_STREAM_DATA){
+ d->prg_cpu[idx]->begin.control =
+ cpu_to_le32(DMA_CTL_OUTPUT_MORE |
+ DMA_CTL_IMMEDIATE | 0x8);
+ } else {
+ d->prg_cpu[idx]->begin.control =
+ cpu_to_le32(DMA_CTL_OUTPUT_MORE |
+ DMA_CTL_IMMEDIATE | 0x10);
+ }
d->prg_cpu[idx]->end.control =
cpu_to_le32(DMA_CTL_OUTPUT_LAST |
DMA_CTL_IRQ |
@@ -724,7 +734,7 @@
d->prg_cpu[idx]->data[0] = packet->speed_code<<16 |
(packet->header[0] & 0xFFFF);
d->prg_cpu[idx]->data[1] = packet->header[0] & 0xFFFF0000;
- packet_swab(d->prg_cpu[idx]->data, packet->tcode, packet->header_size>>2);
+ packet_swab(d->prg_cpu[idx]->data, packet->tcode);
d->prg_cpu[idx]->begin.control =
cpu_to_le32(DMA_CTL_OUTPUT_MORE |
@@ -869,7 +879,7 @@
spin_lock_irqsave(&d->lock,flags);
list_add_tail(&packet->driver_list, &d->pending_list);
-
+
dma_trm_flush(ohci, d);
spin_unlock_irqrestore(&d->lock,flags);
@@ -893,11 +903,11 @@
case GET_CYCLE_COUNTER:
retval = reg_read(ohci, OHCI1394_IsochronousCycleTimer);
break;
-
+
case SET_CYCLE_COUNTER:
reg_write(ohci, OHCI1394_IsochronousCycleTimer, arg);
break;
-
+
case SET_BUS_ID:
PRINT(KERN_ERR, ohci->id, "devctl command SET_BUS_ID err");
break;
@@ -974,7 +984,7 @@
DBGMSG(ohci->id, "ISO receive legacy context activated");
}
-
+
ohci->ISO_channel_usage |= mask;
ohci->ir_legacy_channels |= mask;
@@ -2186,10 +2196,52 @@
DBGMSG(ohci->id, "IntEvent: %08x", event);
- /* Die right here an now */
if (event & OHCI1394_unrecoverableError) {
- PRINT(KERN_ERR, ohci->id, "Unrecoverable error, shutting down card!");
- return;
+ int ctx;
+ PRINT(KERN_ERR, ohci->id, "Unrecoverable error!");
+
+ if (reg_read(ohci, OHCI1394_AsReqTrContextControlSet) & 0x800)
+ PRINT(KERN_ERR, ohci->id, "Async Req Tx Context died: "
+ "ctrl[%08x] cmdptr[%08x]",
+ reg_read(ohci, OHCI1394_AsReqTrContextControlSet),
+ reg_read(ohci, OHCI1394_AsReqTrCommandPtr));
+
+ if (reg_read(ohci, OHCI1394_AsRspTrContextControlSet) & 0x800)
+ PRINT(KERN_ERR, ohci->id, "Async Rsp Tx Context died: "
+ "ctrl[%08x] cmdptr[%08x]",
+ reg_read(ohci, OHCI1394_AsRspTrContextControlSet),
+ reg_read(ohci, OHCI1394_AsRspTrCommandPtr));
+
+ if (reg_read(ohci, OHCI1394_AsReqRcvContextControlSet) & 0x800)
+ PRINT(KERN_ERR, ohci->id, "Async Req Rcv Context died: "
+ "ctrl[%08x] cmdptr[%08x]",
+ reg_read(ohci, OHCI1394_AsReqRcvContextControlSet),
+ reg_read(ohci, OHCI1394_AsReqRcvCommandPtr));
+
+ if (reg_read(ohci, OHCI1394_AsRspRcvContextControlSet) & 0x800)
+ PRINT(KERN_ERR, ohci->id, "Async Rsp Rcv Context died: "
+ "ctrl[%08x] cmdptr[%08x]",
+ reg_read(ohci, OHCI1394_AsRspRcvContextControlSet),
+ reg_read(ohci, OHCI1394_AsRspRcvCommandPtr));
+
+ for (ctx = 0; ctx < ohci->nb_iso_xmit_ctx; ctx++) {
+ if (reg_read(ohci, OHCI1394_IsoXmitContextControlSet + (16 * ctx)) & 0x800)
+ PRINT(KERN_ERR, ohci->id, "Iso Xmit %d Context died: "
+ "ctrl[%08x] cmdptr[%08x]", ctx,
+ reg_read(ohci, OHCI1394_IsoXmitContextControlSet + (16 * ctx)),
+ reg_read(ohci, OHCI1394_IsoXmitCommandPtr + (16 * ctx)));
+ }
+
+ for (ctx = 0; ctx < ohci->nb_iso_rcv_ctx; ctx++) {
+ if (reg_read(ohci, OHCI1394_IsoRcvContextControlSet + (32 * ctx)) & 0x800)
+ PRINT(KERN_ERR, ohci->id, "Iso Recv %d Context died: "
+ "ctrl[%08x] cmdptr[%08x] match[%08x]", ctx,
+ reg_read(ohci, OHCI1394_IsoRcvContextControlSet + (32 * ctx)),
+ reg_read(ohci, OHCI1394_IsoRcvCommandPtr + (32 * ctx)),
+ reg_read(ohci, OHCI1394_IsoRcvContextMatch + (32 * ctx)));
+ }
+
+ event &= ~OHCI1394_unrecoverableError;
}
if (event & OHCI1394_cycleInconsistent) {
@@ -2306,9 +2358,9 @@
isroot = (node_id & 0x40000000) != 0;
DBGMSG(ohci->id,
- "SelfID interrupt received "
- "(phyid %d, %s)", phyid,
- (isroot ? "root" : "not root"));
+ "SelfID interrupt received "
+ "(phyid %d, %s)", phyid,
+ (isroot ? "root" : "not root"));
handle_selfid(ohci, host, phyid, isroot);
@@ -2342,7 +2394,7 @@
hpsb_selfid_complete(host, phyid, isroot);
} else
- PRINT(KERN_ERR, ohci->id,
+ PRINT(KERN_ERR, ohci->id,
"SelfID received outside of bus reset sequence");
selfid_not_valid:
@@ -2520,7 +2572,7 @@
* bus reset. We always ignore it. */
if (tcode != OHCI1394_TCODE_PHY) {
if (!ohci->no_swap_incoming)
- packet_swab(d->spb, tcode, (length - 4) >> 2);
+ packet_swab(d->spb, tcode);
DBGMSG(ohci->id, "Packet received from node"
" %d ack=0x%02X spd=%d tcode=0x%X"
" length=%d ctx=%d tlabel=%d",
@@ -2715,11 +2767,11 @@
if (d->prg_cpu) {
for (i=0; i<d->num_desc; i++)
if (d->prg_cpu[i] && d->prg_bus[i]) {
- pci_free_consistent(
- d->ohci->dev, sizeof(struct dma_cmd),
- d->prg_cpu[i], d->prg_bus[i]);
+ pci_pool_free(d->prg_pool, d->prg_cpu[i], d->prg_bus[i]);
OHCI_DMA_FREE("consistent dma_rcv prg[%d]", i);
}
+ pci_pool_destroy(d->prg_pool);
+ OHCI_DMA_FREE("dma_rcv prg pool");
kfree(d->prg_cpu);
kfree(d->prg_bus);
}
@@ -2779,6 +2831,10 @@
return -ENOMEM;
}
+ d->prg_pool = pci_pool_create("ohci1394 rcv prg", ohci->dev,
+ sizeof(struct dma_cmd), 4, 0, SLAB_KERNEL);
+ OHCI_DMA_ALLOC("dma_rcv prg pool");
+
for (i=0; i<d->num_desc; i++) {
d->buf_cpu[i] = pci_alloc_consistent(ohci->dev,
d->buf_size,
@@ -2794,11 +2850,8 @@
return -ENOMEM;
}
-
- d->prg_cpu[i] = pci_alloc_consistent(ohci->dev,
- sizeof(struct dma_cmd),
- d->prg_bus+i);
- OHCI_DMA_ALLOC("consistent dma_rcv prg[%d]", i);
+ d->prg_cpu[i] = pci_pool_alloc(d->prg_pool, SLAB_KERNEL, d->prg_bus+i);
+ OHCI_DMA_ALLOC("pool dma_rcv prg[%d]", i);
if (d->prg_cpu[i] != NULL) {
memset(d->prg_cpu[i], 0, sizeof(struct dma_cmd));
@@ -2866,11 +2919,11 @@
if (d->prg_cpu) {
for (i=0; i<d->num_desc; i++)
if (d->prg_cpu[i] && d->prg_bus[i]) {
- pci_free_consistent(
- d->ohci->dev, sizeof(struct at_dma_prg),
- d->prg_cpu[i], d->prg_bus[i]);
- OHCI_DMA_FREE("consistent dma_trm prg[%d]", i);
+ pci_pool_free(d->prg_pool, d->prg_cpu[i], d->prg_bus[i]);
+ OHCI_DMA_FREE("pool dma_trm prg[%d]", i);
}
+ pci_pool_destroy(d->prg_pool);
+ OHCI_DMA_FREE("dma_trm prg pool");
kfree(d->prg_cpu);
kfree(d->prg_bus);
}
@@ -2906,11 +2959,13 @@
memset(d->prg_cpu, 0, d->num_desc * sizeof(struct at_dma_prg*));
memset(d->prg_bus, 0, d->num_desc * sizeof(dma_addr_t));
+ d->prg_pool = pci_pool_create("ohci1394 trm prg", ohci->dev,
+ sizeof(struct at_dma_prg), 4, 0, SLAB_KERNEL);
+ OHCI_DMA_ALLOC("dma_rcv prg pool");
+
for (i = 0; i < d->num_desc; i++) {
- d->prg_cpu[i] = pci_alloc_consistent(ohci->dev,
- sizeof(struct at_dma_prg),
- d->prg_bus+i);
- OHCI_DMA_ALLOC("consistent dma_trm prg[%d]", i);
+ d->prg_cpu[i] = pci_pool_alloc(d->prg_pool, SLAB_KERNEL, d->prg_bus+i);
+ OHCI_DMA_ALLOC("pool dma_trm prg[%d]", i);
if (d->prg_cpu[i] != NULL) {
memset(d->prg_cpu[i], 0, sizeof(struct at_dma_prg));
@@ -3150,7 +3205,7 @@
struct hpsb_host *host;
struct ti_ohci *ohci; /* shortcut to currently handled device */
unsigned long ohci_base;
-
+
if (version_printed++ == 0)
PRINT_G(KERN_INFO, "%s", version);
@@ -3226,7 +3281,7 @@
pci_alloc_consistent(ohci->dev, OHCI1394_SI_DMA_BUF_SIZE,
&ohci->selfid_buf_bus);
OHCI_DMA_ALLOC("consistent selfid_buf");
-
+
if (ohci->selfid_buf_cpu == NULL)
FAIL(-ENOMEM, "Failed to allocate DMA buffer for self-id packets");
ohci->init_state = OHCI_INIT_HAVE_SELFID_BUFFER;
@@ -3349,10 +3404,10 @@
/* Free IR dma */
free_dma_rcv_ctx(&ohci->ir_legacy_context);
-
+
/* Free IT dma */
free_dma_trm_ctx(&ohci->it_legacy_context);
-
+
case OHCI_INIT_HAVE_SELFID_BUFFER:
pci_free_consistent(ohci->dev, OHCI1394_SI_DMA_BUF_SIZE,
ohci->selfid_buf_cpu,
Modified: branches/linux-2.4/ohci1394.h
==============================================================================
--- branches/linux-2.4/ohci1394.h (original)
+++ branches/linux-2.4/ohci1394.h 2003-02-28 20:47:29.000000000 -0500
@@ -95,6 +95,7 @@
/* dma block descriptors */
struct dma_cmd **prg_cpu;
dma_addr_t *prg_bus;
+ struct pci_pool *prg_pool;
/* dma buffers */
quadlet_t **buf_cpu;
@@ -121,6 +122,7 @@
/* dma block descriptors */
struct at_dma_prg **prg_cpu;
dma_addr_t *prg_bus;
+ struct pci_pool *prg_pool;
unsigned int prg_ind;
unsigned int sent_ind;
@@ -186,7 +188,7 @@
struct dma_trm_ctx at_resp_context;
struct dma_trm_ctx at_req_context;
- /* iso receive */
+ /* iso receive */
int nb_iso_rcv_ctx;
unsigned long ir_ctx_usage; /* use test_and_set_bit() for atomicity */
unsigned long ir_multichannel_used; /* ditto */
Modified: branches/linux-2.4/ieee1394.h
==============================================================================
--- branches/linux-2.4/ieee1394.h (original)
+++ branches/linux-2.4/ieee1394.h 2003-02-28 20:47:29.000000000 -0500
@@ -15,6 +15,7 @@
#define TCODE_CYCLE_START 0x8
#define TCODE_LOCK_REQUEST 0x9
#define TCODE_ISO_DATA 0xa
+#define TCODE_STREAM_DATA 0xa
#define TCODE_LOCK_RESPONSE 0xb
#define RCODE_COMPLETE 0x0
|