Mailing List archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[linux-dvb] Re: linux-dvb Re Nova-s CAMCI support
On Thursday 13 May 2004 15:20, you wrote:
> > I don't know what DA IRQ:s are :( but now there is a wakeup logged for
> > both IRQ:s.
>
> DA => CAM has Data Available for the host to read.
>
> > I had to move the logging to a 75 GB partition because this thing eats
> > diskspace like crazy. ;-)
>
> The CAM protocol isn't the most efficient protocol existing :)
>
> > May 13 15:00:58 htpc kernel: dvb_ca_en50221_io_write
> > May 13 15:00:58 htpc kernel: dvb_ca_en50221_write_data
> > May 13 15:00:58 htpc kernel: dvb_ca_en50221_io_poll
> > May 13 15:00:58 htpc kernel: FR/DA IRQ slot:0
> > May 13 15:00:58 htpc kernel: dvb_ca_en50221_thread_wakeup
> > May 13 15:00:58 htpc kernel: dvb_ca_en50221_read_data
> > May 13 15:00:58 htpc kernel: FR/DA IRQ slot:0
> > May 13 15:00:58 htpc kernel: dvb_ca_en50221_thread_wakeup
> > May 13 15:00:58 htpc kernel: dvb_ca_en50221_read_data
> > May 13 15:00:58 htpc kernel: dvb_ca_en50221_read_data
> > May 13 15:00:58 htpc kernel: dvb_ca_en50221_io_poll
> > May 13 15:00:58 htpc kernel: dvb_ca_en50221_io_read
> > May 13 15:00:58 htpc kernel: dvb_ca_en50221_io_do_ioctl
> > May 13 15:00:58 htpc kernel: dvb_ca_en50221_slot_shutdown
>
> As you say, thats looking better now. But you're still getting the read
> failed problem I see :(
>
> The constant writing is the higher level CI library polling the CAM for
> data. Normally the CAM replies saying theres nothing for it. The double
> read must be when the CAM replies with some data for the application.
Hi, please try the attached patch when you have a moment - I realised I could
optimise the data reading a bit, and I've added in some more debugging in
order to use up more of your HDD space :)
Index: linux/drivers/media/dvb/dvb-core/dvb_ca_en50221.c
===================================================================
RCS file: /cvs/linuxtv/dvb-kernel/linux/drivers/media/dvb/dvb-core/dvb_ca_en50221.c,v
retrieving revision 1.9
diff -a -u -b -r1.9 dvb_ca_en50221.c
--- linux/drivers/media/dvb/dvb-core/dvb_ca_en50221.c 3 May 2004 16:29:27 -0000 1.9
+++ linux/drivers/media/dvb/dvb-core/dvb_ca_en50221.c 13 May 2004 15:55:36 -0000
@@ -34,7 +34,7 @@
#include <linux/module.h>
#include <linux/vmalloc.h>
#include <linux/delay.h>
-#include <asm/semaphore.h>
+#include <asm/rwsem.h>
#include <asm/atomic.h>
#include "dvb_ca_en50221.h"
@@ -108,7 +108,7 @@
int link_buf_size;
/* semaphore for syncing access to slot structure */
- struct semaphore sem;
+ struct rw_semaphore sem;
/* buffer for incoming packets */
struct dvb_ringbuffer rx_buffer;
@@ -199,7 +199,6 @@
static int dvb_ca_en50221_check_camstatus(struct dvb_ca_private* ca, int slot)
{
int slot_status;
- int status;
int cam_present_now;
int cam_changed;
@@ -209,9 +208,7 @@
}
/* poll mode */
- if ((status = down_interruptible(&ca->slot_info[slot].sem)) != 0) return status;
slot_status = ca->pub->poll_slot_status(ca->pub, slot);
- up(&ca->slot_info[slot].sem);
cam_present_now = (slot_status & DVB_CA_EN50221_POLL_CAM_PRESENT) ? 1: 0;
cam_changed = (slot_status & DVB_CA_EN50221_POLL_CAM_CHANGED) ? 1: 0;
@@ -550,25 +547,22 @@
dprintk ("%s\n", __FUNCTION__);
- /* acquire the slot */
- if ((status = down_interruptible(&ca->slot_info[slot].sem)) != 0) return status;
-
/* check if we have space for a link buf in the rx_buffer */
if (ebuf == NULL) {
- if (dvb_ringbuffer_free(&ca->slot_info[slot].rx_buffer) <
- (ca->slot_info[slot].link_buf_size + DVB_RINGBUFFER_PKTHDRSIZE)) {
+ int buf_free;
+
+ down_read(&ca->slot_info[slot].sem);
+ buf_free = dvb_ringbuffer_free(&ca->slot_info[slot].rx_buffer);
+ up_read(&ca->slot_info[slot].sem);
+
+ if (buf_free < (ca->slot_info[slot].link_buf_size + DVB_RINGBUFFER_PKTHDRSIZE)) {
status = -EAGAIN;
goto exit;
}
}
- /* reset the interface if there's been a tx error */
+ /* check if there is data available */
if ((status = ca->pub->read_cam_control(ca->pub, slot, CTRLIF_STATUS)) < 0) goto exit;
- if (status & STATUSREG_TXERR) {
- ca->slot_info[slot].slot_state = DVB_CA_SLOTSTATE_LINKINIT;
- status = -EIO;
- goto exit;
- }
if (!(status & STATUSREG_DA)) {
/* no data */
status = 0;
@@ -612,29 +606,32 @@
buf[i] = status;
}
- /* check for read error (RE should now go to 0) */
+ /* check for read error (RE should now be 0) */
if ((status = ca->pub->read_cam_control(ca->pub, slot, CTRLIF_STATUS)) < 0) goto exit;
if (status & STATUSREG_RE) {
+ ca->slot_info[slot].slot_state = DVB_CA_SLOTSTATE_LINKINIT;
status = -EIO;
goto exit;
}
/* OK, add it to the receive buffer, or copy into external buffer if supplied */
if (ebuf == NULL) {
+ down_read(&ca->slot_info[slot].sem);
dvb_ringbuffer_pkt_write(&ca->slot_info[slot].rx_buffer, buf, bytes_read, 0);
+ up_read(&ca->slot_info[slot].sem);
} else {
memcpy(ebuf, buf, bytes_read);
}
+ dprintk("Received CA packet for slot %i connection id 0x%x last_frag:%i size:0x%x\n", slot, buf[0], (buf[1] & 0x80) == 0, bytes_read);
+
/* wake up readers when a last_fragment is received */
if ((buf[1] & 0x80) == 0x00) {
wake_up_interruptible(&ca->wait_queue);
}
-
status = bytes_read;
exit:
- up(&ca->slot_info[slot].sem);
return status;
}
@@ -662,19 +659,9 @@
// sanity check
if (bytes_write > ca->slot_info[slot].link_buf_size) return -EINVAL;
- /* acquire the slot */
- if ((status = down_interruptible(&ca->slot_info[slot].sem)) != 0) return status;
-
- /* reset the interface if there's been a tx error */
+ /* check if interface is actually waiting for us to read from it, or if a read is in progress */
if ((status = ca->pub->read_cam_control(ca->pub, slot, CTRLIF_STATUS)) < 0) goto exitnowrite;
- if (status & STATUSREG_TXERR) {
- ca->slot_info[slot].slot_state = DVB_CA_SLOTSTATE_LINKINIT;
- status = -EIO;
- goto exitnowrite;
- }
-
- /* check if interface is actually waiting for us to read from it */
- if (status & STATUSREG_DA) {
+ if (status & (STATUSREG_DA|STATUSREG_RE)) {
status = -EAGAIN;
goto exitnowrite;
}
@@ -702,16 +689,18 @@
/* check for write error (WE should now be 0) */
if ((status = ca->pub->read_cam_control(ca->pub, slot, CTRLIF_STATUS)) < 0) goto exit;
if (status & STATUSREG_WE) {
+ ca->slot_info[slot].slot_state = DVB_CA_SLOTSTATE_LINKINIT;
status = -EIO;
goto exit;
}
status = bytes_write;
+ dprintk("Wrote CA packet for slot %i, connection id 0x%x last_frag:%i size:0x%x\n", slot, buf[0], (buf[1] & 0x80) == 0, bytes_write);
+
exit:
ca->pub->write_cam_control(ca->pub, slot, CTRLIF_COMMAND, IRQEN);
exitnowrite:
- up(&ca->slot_info[slot].sem);
return status;
}
@@ -729,16 +718,14 @@
*/
static int dvb_ca_en50221_slot_shutdown(struct dvb_ca_private* ca, int slot)
{
- int status;
-
dprintk ("%s\n", __FUNCTION__);
- if ((status = down_interruptible(&ca->slot_info[slot].sem)) != 0) return status;
+ down_write(&ca->slot_info[slot].sem);
ca->pub->slot_shutdown(ca->pub, slot);
ca->slot_info[slot].slot_state = DVB_CA_SLOTSTATE_NONE;
if (ca->slot_info[slot].rx_buffer.data) vfree(ca->slot_info[slot].rx_buffer.data);
ca->slot_info[slot].rx_buffer.data = NULL;
- up(&ca->slot_info[slot].sem);
+ up_write(&ca->slot_info[slot].sem);
/* need to wake up all processes to check if they're now
trying to write to a defunct CAM */
@@ -821,10 +808,7 @@
break;
case DVB_CA_SLOTSTATE_RUNNING:
- flags = ca->pub->read_cam_control(pubca, slot, CTRLIF_STATUS);
- if (flags & STATUSREG_DA) {
- dvb_ca_en50221_thread_wakeup(ca);
- }
+ dvb_ca_en50221_read_data(ca, slot, NULL, 0);
break;
}
}
@@ -1054,6 +1038,10 @@
case DVB_CA_SLOTSTATE_RUNNING:
if (!ca->open) break;
+ // no need to poll if the CAM supports IRQs
+ if (ca->slot_info[slot].da_irq_supported) break;
+
+ // poll mode
pktcount = 0;
while(dvb_ca_en50221_read_data(ca, slot, NULL, 0) > 0) {
if (!ca->open) break;
@@ -1266,7 +1254,7 @@
while((slot_count < ca->slot_count) && (!found)) {
if (ca->slot_info[slot].slot_state != DVB_CA_SLOTSTATE_RUNNING) goto nextslot;
- if ((*result = down_interruptible(&ca->slot_info[slot].sem)) != 0) return 1;
+ down_read(&ca->slot_info[slot].sem);
idx = dvb_ringbuffer_pkt_next(&ca->slot_info[slot].rx_buffer, -1, &fraglen);
while(idx != -1) {
@@ -1281,7 +1269,7 @@
idx = dvb_ringbuffer_pkt_next(&ca->slot_info[slot].rx_buffer, idx, &fraglen);
}
- if (!found) up(&ca->slot_info[slot].sem);
+ if (!found) up_read(&ca->slot_info[slot].sem);
nextslot:
slot = (slot + 1) % ca->slot_count;
@@ -1378,7 +1366,7 @@
status = pktlen;
exit:
- up(&ca->slot_info[slot].sem);
+ up_read(&ca->slot_info[slot].sem);
return status;
}
@@ -1406,7 +1394,9 @@
for(i=0; i< ca->slot_count; i++) {
if (ca->slot_info[i].slot_state == DVB_CA_SLOTSTATE_RUNNING) {
+ down_write(&ca->slot_info[i].sem);
dvb_ringbuffer_flush(&ca->slot_info[i].rx_buffer);
+ up_write(&ca->slot_info[i].sem);
}
}
@@ -1464,7 +1454,7 @@
dprintk ("%s\n", __FUNCTION__);
if (dvb_ca_en50221_io_read_condition(ca, &result, &slot) == 1) {
- up(&ca->slot_info[slot].sem);
+ up_read(&ca->slot_info[slot].sem);
mask |= POLLIN;
}
@@ -1475,7 +1465,7 @@
poll_wait(file, &ca->wait_queue, wait);
if (dvb_ca_en50221_io_read_condition(ca, &result, &slot) == 1) {
- up(&ca->slot_info[slot].sem);
+ up_read(&ca->slot_info[slot].sem);
mask |= POLLIN;
}
@@ -1559,7 +1549,7 @@
ca->slot_info[i].slot_state = DVB_CA_SLOTSTATE_NONE;
atomic_set(&ca->slot_info[i].camchange_count, 0);
ca->slot_info[i].camchange_type = DVB_CA_EN50221_CAMCHANGE_REMOVED;
- init_MUTEX(&ca->slot_info[i].sem);
+ init_rwsem(&ca->slot_info[i].sem);
}
if (signal_pending(current)) {
Index: linux/drivers/media/dvb/dvb-core/dvb_ca_en50221.h
===================================================================
RCS file: /cvs/linuxtv/dvb-kernel/linux/drivers/media/dvb/dvb-core/dvb_ca_en50221.h,v
retrieving revision 1.1
diff -a -u -b -r1.1 dvb_ca_en50221.h
--- linux/drivers/media/dvb/dvb-core/dvb_ca_en50221.h 5 Apr 2004 12:17:33 -0000 1.1
+++ linux/drivers/media/dvb/dvb-core/dvb_ca_en50221.h 13 May 2004 15:55:36 -0000
@@ -42,6 +42,9 @@
/* Structure describing a CA interface */
struct dvb_ca_en50221 {
+ /* NOTE: the read_*, write_* and poll_slot_status functions must use locks as
+ * they may be called from several threads at once */
+
/* functions for accessing attribute memory on the CAM */
int (*read_attribute_mem)(struct dvb_ca_en50221* ca, int slot, int address);
int (*write_attribute_mem)(struct dvb_ca_en50221* ca, int slot, int address, u8 value);
Home |
Main Index |
Thread Index