* [PATCH 0/2] Add timers to en50221 protocol driver
@ 2017-09-17 1:27 Jasmin J.
2017-09-17 1:27 ` [PATCH 1/2] Store device structure in dvb_register_device Jasmin J.
` (2 more replies)
0 siblings, 3 replies; 9+ messages in thread
From: Jasmin J. @ 2017-09-17 1:27 UTC (permalink / raw)
To: linux-media; +Cc: mchehab, rjkm, d.scheller, jasmin
From: Jasmin Jessich <jasmin@anw.at>
Some (older) CAMs are really slow in accepting data. I got sometimes the
already known error "CAM tried to send a buffer larger than the ecount
size". I could track it down to the dvb_ca_en50221_write_data function not
waiting between sending the data length high/low and data bytes. In fact
the CAM reported a WR error, which triggered later on the mentioned error.
The problem is that a simple module parameter can't be used to solve this
by adding timer values, because the protocol handler is used for any CI
interface. A module parameter would be influence all the CAMs on all CI
interfaces. Thus individual timer definitions per CI interface and CAM are
required.
There are two possibilities to implement that, ioctl's and SysFS.
ioctl's require changes in usermode programs and it my take a lot of time
to get this implemented there.
SysFS can be used by simple "cat" and "echo" commands and can be therefore
simply controlled by scripting, which is immediately available.
I decided to go for the SysFS approach, but the required device to add the
SysFS files was not available in the "struct dvb_device". The first patch
of this series adds this device to the structure and also the setting code.
The second patch adds the functions to create the SysFS nodes for all
timers and the new timeouts in the en50221 protocol driver.
Jasmin Jessich (2):
Store device structure in dvb_register_device
Added timers for dvb_ca_en50221_write_data
drivers/media/dvb-core/dvb_ca_en50221.c | 132 +++++++++++++++++++++++++++++++-
drivers/media/dvb-core/dvbdev.c | 1 +
drivers/media/dvb-core/dvbdev.h | 4 +-
3 files changed, 135 insertions(+), 2 deletions(-)
--
2.7.4
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 1/2] Store device structure in dvb_register_device
2017-09-17 1:27 [PATCH 0/2] Add timers to en50221 protocol driver Jasmin J.
@ 2017-09-17 1:27 ` Jasmin J.
2017-09-17 1:27 ` [PATCH 2/2] Added timers for dvb_ca_en50221_write_data Jasmin J.
2017-10-15 13:59 ` [PATCH 0/2] Add timers to en50221 protocol driver Jasmin J.
2 siblings, 0 replies; 9+ messages in thread
From: Jasmin J. @ 2017-09-17 1:27 UTC (permalink / raw)
To: linux-media; +Cc: mchehab, rjkm, d.scheller, jasmin
From: Jasmin Jessich <jasmin@anw.at>
The device created by device_create in dvb_register_device was not
available for DVB device drivers.
Added "struct device *dev" to "struct dvb_device" and store the created
device.
Signed-off-by: Jasmin Jessich <jasmin@anw.at>
---
drivers/media/dvb-core/dvbdev.c | 1 +
drivers/media/dvb-core/dvbdev.h | 4 +++-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/media/dvb-core/dvbdev.c b/drivers/media/dvb-core/dvbdev.c
index 41aad0f..fef9d7c 100644
--- a/drivers/media/dvb-core/dvbdev.c
+++ b/drivers/media/dvb-core/dvbdev.c
@@ -516,6 +516,7 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev,
__func__, adap->num, dnames[type], id, PTR_ERR(clsdev));
return PTR_ERR(clsdev);
}
+ dvbdev->dev = clsdev;
dprintk("DVB: register adapter%d/%s%d @ minor: %i (0x%02x)\n",
adap->num, dnames[type], id, minor, minor);
diff --git a/drivers/media/dvb-core/dvbdev.h b/drivers/media/dvb-core/dvbdev.h
index 4918939..94667c8 100644
--- a/drivers/media/dvb-core/dvbdev.h
+++ b/drivers/media/dvb-core/dvbdev.h
@@ -126,10 +126,11 @@ struct dvb_adapter {
* @tsout_num_entities: Number of Transport Stream output entities
* @tsout_entity: array with MC entities associated to each TS output node
* @tsout_pads: array with the source pads for each @tsout_entity
+ * @dev: pointer to struct device that is associated with the dvb device
*
* This structure is used by the DVB core (frontend, CA, net, demux) in
* order to create the device nodes. Usually, driver should not initialize
- * this struct diretly.
+ * this struct directly.
*/
struct dvb_device {
struct list_head list_head;
@@ -162,6 +163,7 @@ struct dvb_device {
#endif
void *priv;
+ struct device *dev;
};
/**
--
2.7.4
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 2/2] Added timers for dvb_ca_en50221_write_data
2017-09-17 1:27 [PATCH 0/2] Add timers to en50221 protocol driver Jasmin J.
2017-09-17 1:27 ` [PATCH 1/2] Store device structure in dvb_register_device Jasmin J.
@ 2017-09-17 1:27 ` Jasmin J.
2017-12-14 12:03 ` Mauro Carvalho Chehab
2017-10-15 13:59 ` [PATCH 0/2] Add timers to en50221 protocol driver Jasmin J.
2 siblings, 1 reply; 9+ messages in thread
From: Jasmin J. @ 2017-09-17 1:27 UTC (permalink / raw)
To: linux-media; +Cc: mchehab, rjkm, d.scheller, jasmin
From: Jasmin Jessich <jasmin@anw.at>
Some (older) CAMs are really slow in accepting data. The CI interface
specification doesn't define a handshake for accepted data. Thus, the
en50221 protocol driver can't control if a data byte has been correctly
written to the CAM.
The current implementation writes the length and the data quick after
each other. Thus, the slow CAMs may generate a WR error, which leads to
the known error logging
"CAM tried to send a buffer larger than the ecount size".
To solve this issue the en50221 protocol driver needs to wait some CAM
depending time between the different bytes to be written. Because the
time is CAM dependent, an individual value per CAM needs to be set. For
that SysFS is used in favor of ioctl's to allow the control of the timer
values independent from any user space application.
This patch adds the timers and the SysFS nodes to set/get the timeout
values and the timer waiting between the different steps of the CAM write
access. A timer value of 0 (default) means "no timeout".
Signed-off-by: Jasmin Jessich <jasmin@anw.at>
---
drivers/media/dvb-core/dvb_ca_en50221.c | 132 +++++++++++++++++++++++++++++++-
1 file changed, 131 insertions(+), 1 deletion(-)
diff --git a/drivers/media/dvb-core/dvb_ca_en50221.c b/drivers/media/dvb-core/dvb_ca_en50221.c
index 95b3723..50c4e45 100644
--- a/drivers/media/dvb-core/dvb_ca_en50221.c
+++ b/drivers/media/dvb-core/dvb_ca_en50221.c
@@ -86,6 +86,13 @@ MODULE_PARM_DESC(cam_debug, "enable verbose debug messages");
#define DVB_CA_SLOTSTATE_WAITFR 6
#define DVB_CA_SLOTSTATE_LINKINIT 7
+enum dvb_ca_timers {
+ DVB_CA_TIM_WR_HIGH /* wait after writing length high */
+, DVB_CA_TIM_WR_LOW /* wait after writing length low */
+, DVB_CA_TIM_WR_DATA /* wait between data bytes */
+, DVB_CA_TIM_MAX
+};
+
/* Information on a CA slot */
struct dvb_ca_slot {
/* current state of the CAM */
@@ -119,6 +126,11 @@ struct dvb_ca_slot {
unsigned long timeout;
};
+struct dvb_ca_timer {
+ unsigned long min;
+ unsigned long max;
+};
+
/* Private CA-interface information */
struct dvb_ca_private {
struct kref refcount;
@@ -161,6 +173,14 @@ struct dvb_ca_private {
/* mutex serializing ioctls */
struct mutex ioctl_mutex;
+
+ struct dvb_ca_timer timers[DVB_CA_TIM_MAX];
+};
+
+static const char dvb_ca_tim_names[DVB_CA_TIM_MAX][15] = {
+ "tim_wr_high"
+, "tim_wr_low"
+, "tim_wr_data"
};
static void dvb_ca_private_free(struct dvb_ca_private *ca)
@@ -223,6 +243,14 @@ static char *findstr(char *haystack, int hlen, char *needle, int nlen)
return NULL;
}
+static void dvb_ca_sleep(struct dvb_ca_private *ca, enum dvb_ca_timers tim)
+{
+ unsigned long min = ca->timers[tim].min;
+
+ if (min)
+ usleep_range(min, ca->timers[tim].max);
+}
+
/* ************************************************************************** */
/* EN50221 physical interface functions */
@@ -868,10 +896,13 @@ static int dvb_ca_en50221_write_data(struct dvb_ca_private *ca, int slot,
bytes_write >> 8);
if (status)
goto exit;
+ dvb_ca_sleep(ca, DVB_CA_TIM_WR_HIGH);
+
status = ca->pub->write_cam_control(ca->pub, slot, CTRLIF_SIZE_LOW,
bytes_write & 0xff);
if (status)
goto exit;
+ dvb_ca_sleep(ca, DVB_CA_TIM_WR_LOW);
/* send the buffer */
for (i = 0; i < bytes_write; i++) {
@@ -879,6 +910,7 @@ static int dvb_ca_en50221_write_data(struct dvb_ca_private *ca, int slot,
buf[i]);
if (status)
goto exit;
+ dvb_ca_sleep(ca, DVB_CA_TIM_WR_DATA);
}
/* check for write error (WE should now be 0) */
@@ -1832,6 +1864,97 @@ static const struct dvb_device dvbdev_ca = {
};
/* ************************************************************************** */
+/* EN50221 device attributes (SysFS) */
+
+static int dvb_ca_tim_idx(struct dvb_ca_private *ca, const char *name)
+{
+ int tim_idx;
+
+ for (tim_idx = 0; tim_idx < DVB_CA_TIM_MAX; tim_idx++) {
+ if (!strcmp(dvb_ca_tim_names[tim_idx], name))
+ return tim_idx;
+ }
+ return -1;
+}
+
+static ssize_t dvb_ca_tim_show(struct device *device,
+ struct device_attribute *attr, char *buf)
+{
+ struct dvb_device *dvbdev = dev_get_drvdata(device);
+ struct dvb_ca_private *ca = dvbdev->priv;
+ int tim_idx = dvb_ca_tim_idx(ca, attr->attr.name);
+
+ if (tim_idx < 0)
+ return -ENXIO;
+
+ return sprintf(buf, "%ld\n", ca->timers[tim_idx].min);
+}
+
+static ssize_t dvb_ca_tim_store(struct device *device,
+ struct device_attribute *attr,
+ const char *buf, size_t count)
+{
+ struct dvb_device *dvbdev = dev_get_drvdata(device);
+ struct dvb_ca_private *ca = dvbdev->priv;
+ int tim_idx = dvb_ca_tim_idx(ca, attr->attr.name);
+ unsigned long min, max;
+
+ if (tim_idx < 0)
+ return -ENXIO;
+
+ if (sscanf(buf, "%lu\n", &min) != 1)
+ return -EINVAL;
+
+ /* value is in us; 100ms is a good maximum */
+ if (min > (100 * USEC_PER_MSEC))
+ return -EINVAL;
+
+ /* +10% (rounded up) */
+ max = (min * 11 + 5) / 10;
+ ca->timers[tim_idx].min = min;
+ ca->timers[tim_idx].max = max;
+
+ return count;
+}
+
+/* attribute definition with string pointer (see include/linux/sysfs.h) */
+#define DVB_CA_ATTR(_name, _mode, _show, _store) { \
+ .attr = {.name = _name, .mode = _mode }, \
+ .show = _show, \
+ .store = _store, \
+}
+
+#define DVB_CA_ATTR_TIM(_tim_idx) \
+ DVB_CA_ATTR(dvb_ca_tim_names[_tim_idx], 0664, dvb_ca_tim_show, \
+ dvb_ca_tim_store)
+
+static const struct device_attribute dvb_ca_attrs[DVB_CA_TIM_MAX] = {
+ DVB_CA_ATTR_TIM(DVB_CA_TIM_WR_HIGH)
+, DVB_CA_ATTR_TIM(DVB_CA_TIM_WR_LOW)
+, DVB_CA_ATTR_TIM(DVB_CA_TIM_WR_DATA)
+};
+
+static int dvb_ca_device_attrs_add(struct dvb_ca_private *ca)
+{
+ int i;
+
+ for (i = 0; i < ARRAY_SIZE(dvb_ca_attrs); i++)
+ if (device_create_file(ca->dvbdev->dev, &dvb_ca_attrs[i]))
+ goto fail;
+ return 0;
+fail:
+ return -1;
+}
+
+static void ddb_device_attrs_del(struct dvb_ca_private *ca)
+{
+ int i;
+
+ for (i = 0; i < ARRAY_SIZE(dvb_ca_attrs); i++)
+ device_remove_file(ca->dvbdev->dev, &dvb_ca_attrs[i]);
+}
+
+/* ************************************************************************** */
/* Initialisation/shutdown functions */
/**
@@ -1901,6 +2024,10 @@ int dvb_ca_en50221_init(struct dvb_adapter *dvb_adapter,
ret = -EINTR;
goto unregister_device;
}
+
+ if (dvb_ca_device_attrs_add(ca))
+ goto unregister_device;
+
mb();
/* create a kthread for monitoring this CA device */
@@ -1910,10 +2037,12 @@ int dvb_ca_en50221_init(struct dvb_adapter *dvb_adapter,
ret = PTR_ERR(ca->thread);
pr_err("dvb_ca_init: failed to start kernel_thread (%d)\n",
ret);
- goto unregister_device;
+ goto delete_attrs;
}
return 0;
+delete_attrs:
+ ddb_device_attrs_del(ca);
unregister_device:
dvb_unregister_device(ca->dvbdev);
free_slot_info:
@@ -1945,6 +2074,7 @@ void dvb_ca_en50221_release(struct dvb_ca_en50221 *pubca)
for (i = 0; i < ca->slot_count; i++)
dvb_ca_en50221_slot_shutdown(ca, i);
+ ddb_device_attrs_del(ca);
dvb_remove_device(ca->dvbdev);
dvb_ca_private_put(ca);
pubca->private = NULL;
--
2.7.4
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH 0/2] Add timers to en50221 protocol driver
2017-09-17 1:27 [PATCH 0/2] Add timers to en50221 protocol driver Jasmin J.
2017-09-17 1:27 ` [PATCH 1/2] Store device structure in dvb_register_device Jasmin J.
2017-09-17 1:27 ` [PATCH 2/2] Added timers for dvb_ca_en50221_write_data Jasmin J.
@ 2017-10-15 13:59 ` Jasmin J.
2017-12-11 21:33 ` Jasmin J.
2 siblings, 1 reply; 9+ messages in thread
From: Jasmin J. @ 2017-10-15 13:59 UTC (permalink / raw)
To: linux-media; +Cc: mchehab, rjkm, d.scheller
Ping!
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 0/2] Add timers to en50221 protocol driver
2017-10-15 13:59 ` [PATCH 0/2] Add timers to en50221 protocol driver Jasmin J.
@ 2017-12-11 21:33 ` Jasmin J.
2017-12-11 21:59 ` Ralph Metzler
0 siblings, 1 reply; 9+ messages in thread
From: Jasmin J. @ 2017-12-11 21:33 UTC (permalink / raw)
To: linux-media; +Cc: mchehab, rjkm, d.scheller
Ping 2!
On 10/15/2017 03:59 PM, Jasmin J. wrote:
> Ping!
>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 0/2] Add timers to en50221 protocol driver
2017-12-11 21:33 ` Jasmin J.
@ 2017-12-11 21:59 ` Ralph Metzler
2017-12-11 23:17 ` Jasmin J.
0 siblings, 1 reply; 9+ messages in thread
From: Ralph Metzler @ 2017-12-11 21:59 UTC (permalink / raw)
To: Jasmin J.; +Cc: linux-media, mchehab, rjkm, d.scheller
Hi,
I don't know if you are also waiting for a comment from me.
I am fine with those changes. They are even desperately needed
to get some "problem CAMs" working.
Regards,
Ralph
Jasmin J. writes:
> Ping 2!
>
> On 10/15/2017 03:59 PM, Jasmin J. wrote:
> > Ping!
> >
--
--
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 0/2] Add timers to en50221 protocol driver
2017-12-11 21:59 ` Ralph Metzler
@ 2017-12-11 23:17 ` Jasmin J.
2017-12-12 9:00 ` Ralph Metzler
0 siblings, 1 reply; 9+ messages in thread
From: Jasmin J. @ 2017-12-11 23:17 UTC (permalink / raw)
To: Ralph Metzler; +Cc: linux-media, mchehab, d.scheller
Hi!
> I don't know if you are also waiting for a comment from me.
All positive ones are welcome ;)
> I am fine with those changes. They are even desperately needed
> to get some "problem CAMs" working.
THX, so we can interpret this as an "Acked-by"?
BR,
Jasmin
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 0/2] Add timers to en50221 protocol driver
2017-12-11 23:17 ` Jasmin J.
@ 2017-12-12 9:00 ` Ralph Metzler
0 siblings, 0 replies; 9+ messages in thread
From: Ralph Metzler @ 2017-12-12 9:00 UTC (permalink / raw)
To: Jasmin J.; +Cc: Ralph Metzler, linux-media, mchehab, d.scheller
Yes, acked-by: Ralph Metzler <rjkm@metzlerbros.de>
Jasmin J. writes:
> Hi!
>
> > I don't know if you are also waiting for a comment from me.
> All positive ones are welcome ;)
>
> > I am fine with those changes. They are even desperately needed
> > to get some "problem CAMs" working.
> THX, so we can interpret this as an "Acked-by"?
>
> BR,
> Jasmin
--
--
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 2/2] Added timers for dvb_ca_en50221_write_data
2017-09-17 1:27 ` [PATCH 2/2] Added timers for dvb_ca_en50221_write_data Jasmin J.
@ 2017-12-14 12:03 ` Mauro Carvalho Chehab
0 siblings, 0 replies; 9+ messages in thread
From: Mauro Carvalho Chehab @ 2017-12-14 12:03 UTC (permalink / raw)
To: Jasmin J.; +Cc: linux-media, rjkm, d.scheller
Em Sun, 17 Sep 2017 03:27:22 +0200
"Jasmin J." <jasmin@anw.at> escreveu:
> From: Jasmin Jessich <jasmin@anw.at>
>
> Some (older) CAMs are really slow in accepting data. The CI interface
> specification doesn't define a handshake for accepted data. Thus, the
> en50221 protocol driver can't control if a data byte has been correctly
> written to the CAM.
>
> The current implementation writes the length and the data quick after
> each other. Thus, the slow CAMs may generate a WR error, which leads to
> the known error logging
> "CAM tried to send a buffer larger than the ecount size".
>
> To solve this issue the en50221 protocol driver needs to wait some CAM
> depending time between the different bytes to be written. Because the
> time is CAM dependent, an individual value per CAM needs to be set. For
> that SysFS is used in favor of ioctl's to allow the control of the timer
> values independent from any user space application.
>
> This patch adds the timers and the SysFS nodes to set/get the timeout
> values and the timer waiting between the different steps of the CAM write
> access. A timer value of 0 (default) means "no timeout".
The patch series looks OK. However, I'm not seeing any documentation
patches explaining the new sysfs interface. I would be expecting an
update at linux DVB uAPI. Also, for all sysfs stuff, you need to add
it to Documentation/ABI/ using the format explained at its README.
Once you add it, I'll gladly apply it. Please add Ralph's ack on the
existing patches on your next submission.
Just a minor nitpick: on all patches, please prepend with "media: "
and the name of the part of the media subsystem that you're patching.
In this case, a good subject would be:
media: dvb-core: add timers for dvb_ca_en50221_write_data
Regards,
Mauro
>
> Signed-off-by: Jasmin Jessich <jasmin@anw.at>
> ---
> drivers/media/dvb-core/dvb_ca_en50221.c | 132 +++++++++++++++++++++++++++++++-
> 1 file changed, 131 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/media/dvb-core/dvb_ca_en50221.c b/drivers/media/dvb-core/dvb_ca_en50221.c
> index 95b3723..50c4e45 100644
> --- a/drivers/media/dvb-core/dvb_ca_en50221.c
> +++ b/drivers/media/dvb-core/dvb_ca_en50221.c
> @@ -86,6 +86,13 @@ MODULE_PARM_DESC(cam_debug, "enable verbose debug messages");
> #define DVB_CA_SLOTSTATE_WAITFR 6
> #define DVB_CA_SLOTSTATE_LINKINIT 7
>
> +enum dvb_ca_timers {
> + DVB_CA_TIM_WR_HIGH /* wait after writing length high */
> +, DVB_CA_TIM_WR_LOW /* wait after writing length low */
> +, DVB_CA_TIM_WR_DATA /* wait between data bytes */
> +, DVB_CA_TIM_MAX
> +};
> +
> /* Information on a CA slot */
> struct dvb_ca_slot {
> /* current state of the CAM */
> @@ -119,6 +126,11 @@ struct dvb_ca_slot {
> unsigned long timeout;
> };
>
> +struct dvb_ca_timer {
> + unsigned long min;
> + unsigned long max;
> +};
> +
> /* Private CA-interface information */
> struct dvb_ca_private {
> struct kref refcount;
> @@ -161,6 +173,14 @@ struct dvb_ca_private {
>
> /* mutex serializing ioctls */
> struct mutex ioctl_mutex;
> +
> + struct dvb_ca_timer timers[DVB_CA_TIM_MAX];
> +};
> +
> +static const char dvb_ca_tim_names[DVB_CA_TIM_MAX][15] = {
> + "tim_wr_high"
> +, "tim_wr_low"
> +, "tim_wr_data"
> };
>
> static void dvb_ca_private_free(struct dvb_ca_private *ca)
> @@ -223,6 +243,14 @@ static char *findstr(char *haystack, int hlen, char *needle, int nlen)
> return NULL;
> }
>
> +static void dvb_ca_sleep(struct dvb_ca_private *ca, enum dvb_ca_timers tim)
> +{
> + unsigned long min = ca->timers[tim].min;
> +
> + if (min)
> + usleep_range(min, ca->timers[tim].max);
> +}
> +
> /* ************************************************************************** */
> /* EN50221 physical interface functions */
>
> @@ -868,10 +896,13 @@ static int dvb_ca_en50221_write_data(struct dvb_ca_private *ca, int slot,
> bytes_write >> 8);
> if (status)
> goto exit;
> + dvb_ca_sleep(ca, DVB_CA_TIM_WR_HIGH);
> +
> status = ca->pub->write_cam_control(ca->pub, slot, CTRLIF_SIZE_LOW,
> bytes_write & 0xff);
> if (status)
> goto exit;
> + dvb_ca_sleep(ca, DVB_CA_TIM_WR_LOW);
>
> /* send the buffer */
> for (i = 0; i < bytes_write; i++) {
> @@ -879,6 +910,7 @@ static int dvb_ca_en50221_write_data(struct dvb_ca_private *ca, int slot,
> buf[i]);
> if (status)
> goto exit;
> + dvb_ca_sleep(ca, DVB_CA_TIM_WR_DATA);
> }
>
> /* check for write error (WE should now be 0) */
> @@ -1832,6 +1864,97 @@ static const struct dvb_device dvbdev_ca = {
> };
>
> /* ************************************************************************** */
> +/* EN50221 device attributes (SysFS) */
> +
> +static int dvb_ca_tim_idx(struct dvb_ca_private *ca, const char *name)
> +{
> + int tim_idx;
> +
> + for (tim_idx = 0; tim_idx < DVB_CA_TIM_MAX; tim_idx++) {
> + if (!strcmp(dvb_ca_tim_names[tim_idx], name))
> + return tim_idx;
> + }
> + return -1;
> +}
> +
> +static ssize_t dvb_ca_tim_show(struct device *device,
> + struct device_attribute *attr, char *buf)
> +{
> + struct dvb_device *dvbdev = dev_get_drvdata(device);
> + struct dvb_ca_private *ca = dvbdev->priv;
> + int tim_idx = dvb_ca_tim_idx(ca, attr->attr.name);
> +
> + if (tim_idx < 0)
> + return -ENXIO;
> +
> + return sprintf(buf, "%ld\n", ca->timers[tim_idx].min);
> +}
> +
> +static ssize_t dvb_ca_tim_store(struct device *device,
> + struct device_attribute *attr,
> + const char *buf, size_t count)
> +{
> + struct dvb_device *dvbdev = dev_get_drvdata(device);
> + struct dvb_ca_private *ca = dvbdev->priv;
> + int tim_idx = dvb_ca_tim_idx(ca, attr->attr.name);
> + unsigned long min, max;
> +
> + if (tim_idx < 0)
> + return -ENXIO;
> +
> + if (sscanf(buf, "%lu\n", &min) != 1)
> + return -EINVAL;
> +
> + /* value is in us; 100ms is a good maximum */
> + if (min > (100 * USEC_PER_MSEC))
> + return -EINVAL;
> +
> + /* +10% (rounded up) */
> + max = (min * 11 + 5) / 10;
> + ca->timers[tim_idx].min = min;
> + ca->timers[tim_idx].max = max;
> +
> + return count;
> +}
> +
> +/* attribute definition with string pointer (see include/linux/sysfs.h) */
> +#define DVB_CA_ATTR(_name, _mode, _show, _store) { \
> + .attr = {.name = _name, .mode = _mode }, \
> + .show = _show, \
> + .store = _store, \
> +}
> +
> +#define DVB_CA_ATTR_TIM(_tim_idx) \
> + DVB_CA_ATTR(dvb_ca_tim_names[_tim_idx], 0664, dvb_ca_tim_show, \
> + dvb_ca_tim_store)
> +
> +static const struct device_attribute dvb_ca_attrs[DVB_CA_TIM_MAX] = {
> + DVB_CA_ATTR_TIM(DVB_CA_TIM_WR_HIGH)
> +, DVB_CA_ATTR_TIM(DVB_CA_TIM_WR_LOW)
> +, DVB_CA_ATTR_TIM(DVB_CA_TIM_WR_DATA)
> +};
> +
> +static int dvb_ca_device_attrs_add(struct dvb_ca_private *ca)
> +{
> + int i;
> +
> + for (i = 0; i < ARRAY_SIZE(dvb_ca_attrs); i++)
> + if (device_create_file(ca->dvbdev->dev, &dvb_ca_attrs[i]))
> + goto fail;
> + return 0;
> +fail:
> + return -1;
> +}
> +
> +static void ddb_device_attrs_del(struct dvb_ca_private *ca)
> +{
> + int i;
> +
> + for (i = 0; i < ARRAY_SIZE(dvb_ca_attrs); i++)
> + device_remove_file(ca->dvbdev->dev, &dvb_ca_attrs[i]);
> +}
> +
> +/* ************************************************************************** */
> /* Initialisation/shutdown functions */
>
> /**
> @@ -1901,6 +2024,10 @@ int dvb_ca_en50221_init(struct dvb_adapter *dvb_adapter,
> ret = -EINTR;
> goto unregister_device;
> }
> +
> + if (dvb_ca_device_attrs_add(ca))
> + goto unregister_device;
> +
> mb();
>
> /* create a kthread for monitoring this CA device */
> @@ -1910,10 +2037,12 @@ int dvb_ca_en50221_init(struct dvb_adapter *dvb_adapter,
> ret = PTR_ERR(ca->thread);
> pr_err("dvb_ca_init: failed to start kernel_thread (%d)\n",
> ret);
> - goto unregister_device;
> + goto delete_attrs;
> }
> return 0;
>
> +delete_attrs:
> + ddb_device_attrs_del(ca);
> unregister_device:
> dvb_unregister_device(ca->dvbdev);
> free_slot_info:
> @@ -1945,6 +2074,7 @@ void dvb_ca_en50221_release(struct dvb_ca_en50221 *pubca)
> for (i = 0; i < ca->slot_count; i++)
> dvb_ca_en50221_slot_shutdown(ca, i);
>
> + ddb_device_attrs_del(ca);
> dvb_remove_device(ca->dvbdev);
> dvb_ca_private_put(ca);
> pubca->private = NULL;
Thanks,
Mauro
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2017-12-14 12:03 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-09-17 1:27 [PATCH 0/2] Add timers to en50221 protocol driver Jasmin J.
2017-09-17 1:27 ` [PATCH 1/2] Store device structure in dvb_register_device Jasmin J.
2017-09-17 1:27 ` [PATCH 2/2] Added timers for dvb_ca_en50221_write_data Jasmin J.
2017-12-14 12:03 ` Mauro Carvalho Chehab
2017-10-15 13:59 ` [PATCH 0/2] Add timers to en50221 protocol driver Jasmin J.
2017-12-11 21:33 ` Jasmin J.
2017-12-11 21:59 ` Ralph Metzler
2017-12-11 23:17 ` Jasmin J.
2017-12-12 9:00 ` Ralph Metzler
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.