media: sunxi-cir: ensure IR is handled when it is continuous
Subsystems (4)
Sean Young
maintainerPATCH 1/2 media: sunxi-cir: ensure IR is handled when it is continuous
If a user holds a button down on a remote, then no ir idle interrupt will be generated until the user releases the button, depending on how quickly the remote repeats. No IR is processed until that point, which means that holding down a button may not do anything.
This also resolves an issue on a Cubieboard 1 where the IR receiver is picking up ambient infrared as IR and spews out endless
"rc rc0: IR event FIFO is full!" messages unless you choose to live in the dark.
--- drivers/media/rc/sunxi-cir.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/media/rc/sunxi-cir.c +2 -0
@@ -137,6 +137,8 @@ static irqreturn_t sunxi_ir_irq(int irqno, void *dev_id) }else if (status ®_RXSTA_RPE ) {ir_raw_event_set_idle (ir->rc, true);ir_raw_event_handle (ir->rc); + }else { +ir_raw_event_handle (ir->rc); }spin_unlock (&ir->ir_lock);
Signature · 1 line
2.28.0
Sean Young
maintainerPATCH 2/2 media: sunxi-cir: allow timeout to be set at runtime
This allows the timeout to be set with the LIRC_SET_REC_TIMEOUT ioctl.
The timeout was hardcoded at just over 20ms, but returned 120ms when queried with the LIRC_GET_REC_TIMEOUT ioctl.
This also ensures the idle threshold is set correctly with a base clock other than 8000000Mhz.
--- drivers/media/rc/sunxi-cir.c | 46 +++++++++++++++++++++++++++++------- 1 file changed, 38 insertions(+), 8 deletions(-)
drivers/media/rc/sunxi-cir.c +38 -8
@@ -73,10 +73,6 @@#define SUNXI_IR_BASE_CLK 8000000/* Noise threshold in samples */ #define SUNXI_IR_RXNOISE 1 -/* Idle Threshold in samples */ -#define SUNXI_IR_RXIDLE 20 -/* Time after which device stops sending data in ms */ -#define SUNXI_IR_TIMEOUT 120/** * struct sunxi_ir_quirks - Differences between SoC variants.
@@ -146,6 +142,39 @@ static irqreturn_t sunxi_ir_irq(int irqno, void *dev_id)return IRQ_HANDLED ; } +/* Convert idle threshold to usec */ +static unsigned int sunxi_ithr_to_usec (unsigned int base_clk,unsigned int ithr) +{ +return (USEC_PER_SEC * (ithr +1 )) / (base_clk / (128 *64 )); +} + +/* Convert usec to idle threshold */ +static unsigned int sunxi_usec_to_ithr (unsigned int base_clk,unsigned int usec) +{ +return ((base_clk / (128 *64 )) * usec) /USEC_PER_SEC ; +} + +static int sunxi_ir_set_timeout (struct rc_dev *rc_dev,unsigned int timeout) +{ +struct sunxi_ir *ir = rc_dev->priv; +unsigned int base_clk =clk_get_rate (ir->clk); +unsigned long flags; + +unsigned int ithr =sunxi_usec_to_ithr (base_clk, timeout); + +dev_dbg (rc_dev->dev.parent,"setting idle threshold to %u\n" , ithr); + +spin_lock_irqsave (&ir->ir_lock, flags); +/* Set noise threshold and idle threshold */ +writel (REG_CIR_NTHR (SUNXI_IR_RXNOISE ) |REG_CIR_ITHR (ithr), + ir->base +SUNXI_IR_CIR_REG ); +spin_unlock_irqrestore (&ir->ir_lock, flags); + + rc_dev->timeout =sunxi_ithr_to_usec (base_clk, ithr); + +return 0 ; +} +static int sunxi_ir_probe (struct platform_device *pdev) {int ret =0 ;
@@ -242,9 +271,11 @@ static int sunxi_ir_probe(struct platform_device *pdev) ir->rc->map_name = ir->map_name ?:RC_MAP_EMPTY ; ir->rc->dev.parent = dev; ir->rc->allowed_protocols =RC_PROTO_BIT_ALL_IR_DECODER ; -/* Frequency after IR internal divider with sample period in ns */ +/* Frequency after IR internal divider with sample period in us */ ir->rc->rx_resolution = (USEC_PER_SEC / (b_clk_freq /64 )); - ir->rc->timeout =MS_TO_US (SUNXI_IR_TIMEOUT ); + ir->rc->min_timeout =sunxi_ithr_to_usec (b_clk_freq,0 ); + ir->rc->max_timeout =sunxi_ithr_to_usec (b_clk_freq,255 ); + ir->rc->s_timeout = sunxi_ir_set_timeout; ir->rc->driver_name =SUNXI_IR_DEV ; ret =rc_register_device (ir->rc);
@@ -272,8 +303,7 @@ static int sunxi_ir_probe(struct platform_device *pdev)writel (REG_CTL_MD , ir->base+SUNXI_IR_CTL_REG );/* Set noise threshold and idle threshold */ -writel (REG_CIR_NTHR (SUNXI_IR_RXNOISE )|REG_CIR_ITHR (SUNXI_IR_RXIDLE ), - ir->base +SUNXI_IR_CIR_REG ); +sunxi_ir_set_timeout (ir->rc,IR_DEFAULT_TIMEOUT );/* Invert Input Signal */ writel (REG_RXCTL_RPPI , ir->base +SUNXI_IR_RXCTL_REG );
Signature · 1 line
2.28.0
Re: [PATCH 2/2] media: sunxi-cir: allow timeout to be set at runtime
Quoted 7 lines · Sean Young
This allows the timeout to be set with the
LIRC_SET_REC_TIMEOUTioctl.The timeout was hardcoded at just over 20ms, but returned 120ms when queried with the
LIRC_GET_REC_TIMEOUTioctl.This also ensures the idle threshold is set correctly with a base clock other than 8000000Mhz.
That's some pretty hardcore overclocking :)
I guess you meant 8MHz?
Other than that, for both patches
Thanks!
Maxime
Sean Young
maintainerRe: [PATCH 2/2] media: sunxi-cir: allow timeout to be set at runtime
Quoted 6 lines · On Tue, Nov 10, 2020 at 01:11:22PM +0100, [email protected] wrote:
Quoted 5 lines · Sean Young
This allows the timeout to be set with the
LIRC_SET_REC_TIMEOUTioctl.The timeout was hardcoded at just over 20ms, but returned 120ms when queried with the
LIRC_GET_REC_TIMEOUTioctl.
Quoted 6 lines
Quoted 2 lines
This also ensures the idle threshold is set correctly with a base clock other than 8000000Mhz.
That's some pretty hardcore overclocking :)
I guess you meant 8MHz?
Yes, I did.
Quoted 3 lines
Other than that, for both patches
Acked-by Maxime Ripard <[email protected]>
Thanks!
Sean
Quoted 5 lines · Sean Young
If a user holds a button down on a remote, then no ir idle interrupt will be generated until the user releases the button, depending on how quickly the remote repeats. No IR is processed until that point, which means that holding down a button may not do anything.
Quoted 8 lines
This also resolves an issue on a Cubieboard 1 where the IR receiver is picking up ambient infrared as IR and spews out endless
"rc rc0: IR event FIFO is full!" messages unless you choose to live in the dark.Reported-by Hans Verkuil <[email protected]>Signed-off-by Sean Young <[email protected]>
Nice! No more spam in the kernel log for my Cubieboard 1!
Thank you,
Hans
Quoted 18 lines
--- drivers/media/rc/sunxi-cir.c | 2 ++ 1 file changed, 2 insertions(+)drivers/media/rc/sunxi-cir.c +2
-0@@ -137,6 +137,8 @@ static irqreturn_t sunxi_ir_irq(int irqno, void *dev_id) }else if (status ®_RXSTA_RPE ) {ir_raw_event_set_idle (ir->rc, true);ir_raw_event_handle (ir->rc); + }else { +ir_raw_event_handle (ir->rc); }spin_unlock (&ir->ir_lock);