Hi Brendan,
The idea is good,
Some comments bellow.
Em Sat, 14 Mar 2015 14:27:39 +1100
Brendan McGrath <[email protected]> escreveu:
> Enhances driver to use an MSI interrupt when available.
>
> Adds the module option 'enable_msi' (type bool) which by default is
> enabled. Can be set to 'N' to disable.
>
> Fixes (or can reduce the occurrence of) a crash which is most commonly
> reported when both digital tuners of the saa7164 chip is in use. A reported example can
> be found here:
> http://permalink.gmane.org/gmane.linux.drivers.video-input-infrastructure/83948
>
> Reviewed-by: Steven Toth <[email protected]>
> Signed-off-by: Brendan McGrath <[email protected]>
> ---
> Changes since v3:
> - fixes a conflict with a commit (3f845f3c4cf4) made to the media_tree after v3 was created (only the unified context has been changed)
> - corrected comments to reflect that the reported incident occured more commonly when multiple tuners were in use (not multiple saa7164 chips as previously stated)
>
>
> drivers/media/pci/saa7164/saa7164-core.c | 40 ++++++++++++++++++++++++++++++--
> drivers/media/pci/saa7164/saa7164.h | 1 +
> 2 files changed, 39 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/media/pci/saa7164/saa7164-core.c b/drivers/media/pci/saa7164/saa7164-core.c
> index 9cf3c6c..7635598 100644
> --- a/drivers/media/pci/saa7164/saa7164-core.c
> +++ b/drivers/media/pci/saa7164/saa7164-core.c
> @@ -85,6 +85,11 @@ module_param(guard_checking, int, 0644);
> MODULE_PARM_DESC(guard_checking,
> "enable dma sanity checking for buffer overruns");
>
> +static bool enable_msi = true;
> +module_param(enable_msi, bool, 0444);
> +MODULE_PARM_DESC(enable_msi,
> + "enable the use of an msi interrupt if available");
> +
> static unsigned int saa7164_devcount;
>
> static DEFINE_MUTEX(devlist);
> @@ -1230,8 +1235,34 @@ static int saa7164_initdev(struct pci_dev *pci_dev,
> goto fail_irq;
> }
>
> - err = request_irq(pci_dev->irq, saa7164_irq,
> - IRQF_SHARED, dev->name, dev);
> + /* irq bit */
> + if (enable_msi)
> + err = pci_enable_msi(pci_dev);
It is worth printing a warning about that.
> +
> + if (!err && enable_msi) {
> + /* no error - so request an msi interrupt */
> + err = request_irq(pci_dev->irq, saa7164_irq, 0,
> + dev->name, dev);
> +
> + if (err) {
> + /* fall back to legacy interrupt */
> + printk(KERN_ERR "%s() Failed to get an MSI interrupt."
> + " Falling back to a shared IRQ\n", __func__);
> + pci_disable_msi(pci_dev);
> + } else {
> + dev->msi = true;
> + }
> + }
It would be better to join this if with the next one, in order
to make clear that both belong to the enable_msi logic. Something like:
static bool saa7164_enable_msi(struct device *pci_dev)
{
if (!enable_msi)
return false;
err = pci_enable_msi(pci_dev);
if (err) {
printf(KERN_ERR "%s() Failed to enable MSI"
" Falling back to a shared IRQ\n", __func__);
return false;
}
err = request_irq(pci_dev->irq, saa7164_irq, 0,
dev->name, dev);
if (err) {
printk(KERN_ERR "%s() Failed to get an MSI interrupt."
" Falling back to a shared IRQ\n", __func__);
pci_disable_msi(pci_dev);
return false;
}
return true;
}
Then, at the probe function, you could simply do:
if (saa7164_enable_msi(pci_dev)) {
dev->msi = true;
} else {
/* SOME_FALLBACK_CODE */
}
The probe function is already complex enough. Breaking it into small
inlined functions makes easier to review. The removal of the if's
is an extra bonus, as the code size will likely be a little bit smaller.
> +
> + if ((!enable_msi) || err) {
> + dev->msi = false;
No need, as dev was initialized with kzalloc(), with zeroes all fields.
Also, you can simplify the "if" clause to:
if (!dev->msi) {
That makes clearer that the code below is to be used when MSI is not
enabled or not initialized properly.
> + /* if we have an error (i.e. we don't have an interrupt)
> + or msi is not enabled - fallback to shared interrupt */
> +
> + err = request_irq(pci_dev->irq, saa7164_irq,
> + IRQF_SHARED, dev->name, dev);
> + }
> +
> if (err < 0) {
> printk(KERN_ERR "%s: can't get IRQ %d\n", dev->name,
> pci_dev->irq);
> @@ -1439,6 +1470,11 @@ static void saa7164_finidev(struct pci_dev *pci_dev)
> /* unregister stuff */
> free_irq(pci_dev->irq, dev);
>
> + if (dev->msi) {
> + pci_disable_msi(pci_dev);
> + dev->msi = false;
> + }
> +
> pci_disable_device(pci_dev);
>
> mutex_lock(&devlist);
> diff --git a/drivers/media/pci/saa7164/saa7164.h b/drivers/media/pci/saa7164/saa7164.h
> index cd1a07c..6df4b252 100644
> --- a/drivers/media/pci/saa7164/saa7164.h
> +++ b/drivers/media/pci/saa7164/saa7164.h
> @@ -459,6 +459,7 @@ struct saa7164_dev {
> /* Interrupt status and ack registers */
> u32 int_status;
> u32 int_ack;
> + u32 msi;
Should be bool instead of u32.
>
> struct cmd cmds[SAA_CMD_MAX_MSG_UNITS];
> struct mutex lock;
Enhances driver to use an MSI interrupt when available.
Adds the module option 'enable_msi' (type bool) which by default is
enabled. Can be set to 'N' to disable.
Fixes (or can reduce the occurrence of) a crash which is most commonly
reported when both digital tuners of the saa7164 chip is in use. A
reported example can be found here:
http://permalink.gmane.org/gmane.linux.drivers.video-input-infrastructure/83948
Reviewed-by: Steven Toth <[email protected]>
Signed-off-by: Brendan McGrath <[email protected]>
---
Changes since v4:
- improved readability by taking on suggestions made by Mauro
- the msi variable in the saa7164_dev structure is now a bool
Thanks Mauro - good suggestions and I think I've taken on board all of them.
drivers/media/pci/saa7164/saa7164-core.c | 66 ++++++++++++++++++++++++++++----
drivers/media/pci/saa7164/saa7164.h | 1 +
2 files changed, 60 insertions(+), 7 deletions(-)
diff --git a/drivers/media/pci/saa7164/saa7164-core.c b/drivers/media/pci/saa7164/saa7164-core.c
index 9cf3c6c..5e4a9f0 100644
--- a/drivers/media/pci/saa7164/saa7164-core.c
+++ b/drivers/media/pci/saa7164/saa7164-core.c
@@ -85,6 +85,11 @@ module_param(guard_checking, int, 0644);
MODULE_PARM_DESC(guard_checking,
"enable dma sanity checking for buffer overruns");
+static bool enable_msi = true;
+module_param(enable_msi, bool, 0444);
+MODULE_PARM_DESC(enable_msi,
+ "enable the use of an msi interrupt if available");
+
static unsigned int saa7164_devcount;
static DEFINE_MUTEX(devlist);
@@ -1184,6 +1189,39 @@ static int saa7164_thread_function(void *data)
return 0;
}
+static bool saa7164_enable_msi(struct pci_dev *pci_dev, struct saa7164_dev *dev)
+{
+ int err;
+
+ if (!enable_msi) {
+ printk(KERN_WARNING "%s() MSI disabled by module parameter 'enable_msi'"
+ , __func__);
+ return false;
+ }
+
+ err = pci_enable_msi(pci_dev);
+
+ if (err) {
+ printk(KERN_ERR "%s() Failed to enable MSI interrupt."
+ " Falling back to a shared IRQ\n", __func__);
+ return false;
+ }
+
+ /* no error - so request an msi interrupt */
+ err = request_irq(pci_dev->irq, saa7164_irq, 0,
+ dev->name, dev);
+
+ if (err) {
+ /* fall back to legacy interrupt */
+ printk(KERN_ERR "%s() Failed to get an MSI interrupt."
+ " Falling back to a shared IRQ\n", __func__);
+ pci_disable_msi(pci_dev);
+ return false;
+ }
+
+ return true;
+}
+
static int saa7164_initdev(struct pci_dev *pci_dev,
const struct pci_device_id *pci_id)
{
@@ -1230,13 +1268,22 @@ static int saa7164_initdev(struct pci_dev *pci_dev,
goto fail_irq;
}
- err = request_irq(pci_dev->irq, saa7164_irq,
- IRQF_SHARED, dev->name, dev);
- if (err < 0) {
- printk(KERN_ERR "%s: can't get IRQ %d\n", dev->name,
- pci_dev->irq);
- err = -EIO;
- goto fail_irq;
+ /* irq bit */
+ if (saa7164_enable_msi(pci_dev, dev)) {
+ dev->msi = true;
+ } else {
+ /* if we have an error (i.e. we don't have an interrupt)
+ or msi is not enabled - fallback to shared interrupt */
+
+ err = request_irq(pci_dev->irq, saa7164_irq,
+ IRQF_SHARED, dev->name, dev);
+
+ if (err < 0) {
+ printk(KERN_ERR "%s: can't get IRQ %d\n", dev->name,
+ pci_dev->irq);
+ err = -EIO;
+ goto fail_irq;
+ }
}
pci_set_drvdata(pci_dev, dev);
@@ -1439,6 +1486,11 @@ static void saa7164_finidev(struct pci_dev *pci_dev)
/* unregister stuff */
free_irq(pci_dev->irq, dev);
+ if (dev->msi) {
+ pci_disable_msi(pci_dev);
+ dev->msi = false;
+ }
+
pci_disable_device(pci_dev);
mutex_lock(&devlist);
diff --git a/drivers/media/pci/saa7164/saa7164.h b/drivers/media/pci/saa7164/saa7164.h
index cd1a07c..75a3f51 100644
--- a/drivers/media/pci/saa7164/saa7164.h
+++ b/drivers/media/pci/saa7164/saa7164.h
@@ -459,6 +459,7 @@ struct saa7164_dev {
/* Interrupt status and ack registers */
u32 int_status;
u32 int_ack;
+ bool msi;
struct cmd cmds[SAA_CMD_MAX_MSG_UNITS];
struct mutex lock;
--
1.9.1
This has been plaguing users for years (there's a number of threads on
the Ubuntu board). I've been using revision 1 of the patch without
issue since early February. This is from having to constantly reboot
the system to flawless recording. If something has been outstanding
from Brendan, please let me know and I'll happily make the requested
changes.
Can we please merge this? There are at-least three consumers in this
thread alone that have confirmed this fixes the saa7164 driver for the
HVR-2250 device.
Kyle.
PS: I can't seem to source out who owns this in the MAINTAINERS file?
On Thu, Apr 9, 2015 at 11:39 PM, Brendan McGrath
<[email protected]> wrote:
> Enhances driver to use an MSI interrupt when available.
>
> Adds the module option 'enable_msi' (type bool) which by default is
> enabled. Can be set to 'N' to disable.
>
> Fixes (or can reduce the occurrence of) a crash which is most commonly
> reported when both digital tuners of the saa7164 chip is in use. A
> reported example can be found here:
> http://permalink.gmane.org/gmane.linux.drivers.video-input-infrastructure/83948
>
> Reviewed-by: Steven Toth <[email protected]>
> Signed-off-by: Brendan McGrath <[email protected]>
> ---
> Changes since v4:
> - improved readability by taking on suggestions made by Mauro
> - the msi variable in the saa7164_dev structure is now a bool
>
> Thanks Mauro - good suggestions and I think I've taken on board all of them.
>
> drivers/media/pci/saa7164/saa7164-core.c | 66 ++++++++++++++++++++++++++++----
> drivers/media/pci/saa7164/saa7164.h | 1 +
> 2 files changed, 60 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/media/pci/saa7164/saa7164-core.c b/drivers/media/pci/saa7164/saa7164-core.c
> index 9cf3c6c..5e4a9f0 100644
> --- a/drivers/media/pci/saa7164/saa7164-core.c
> +++ b/drivers/media/pci/saa7164/saa7164-core.c
> @@ -85,6 +85,11 @@ module_param(guard_checking, int, 0644);
> MODULE_PARM_DESC(guard_checking,
> "enable dma sanity checking for buffer overruns");
>
> +static bool enable_msi = true;
> +module_param(enable_msi, bool, 0444);
> +MODULE_PARM_DESC(enable_msi,
> + "enable the use of an msi interrupt if available");
> +
> static unsigned int saa7164_devcount;
>
> static DEFINE_MUTEX(devlist);
> @@ -1184,6 +1189,39 @@ static int saa7164_thread_function(void *data)
> return 0;
> }
>
> +static bool saa7164_enable_msi(struct pci_dev *pci_dev, struct saa7164_dev *dev)
> +{
> + int err;
> +
> + if (!enable_msi) {
> + printk(KERN_WARNING "%s() MSI disabled by module parameter 'enable_msi'"
> + , __func__);
> + return false;
> + }
> +
> + err = pci_enable_msi(pci_dev);
> +
> + if (err) {
> + printk(KERN_ERR "%s() Failed to enable MSI interrupt."
> + " Falling back to a shared IRQ\n", __func__);
> + return false;
> + }
> +
> + /* no error - so request an msi interrupt */
> + err = request_irq(pci_dev->irq, saa7164_irq, 0,
> + dev->name, dev);
> +
> + if (err) {
> + /* fall back to legacy interrupt */
> + printk(KERN_ERR "%s() Failed to get an MSI interrupt."
> + " Falling back to a shared IRQ\n", __func__);
> + pci_disable_msi(pci_dev);
> + return false;
> + }
> +
> + return true;
> +}
> +
> static int saa7164_initdev(struct pci_dev *pci_dev,
> const struct pci_device_id *pci_id)
> {
> @@ -1230,13 +1268,22 @@ static int saa7164_initdev(struct pci_dev *pci_dev,
> goto fail_irq;
> }
>
> - err = request_irq(pci_dev->irq, saa7164_irq,
> - IRQF_SHARED, dev->name, dev);
> - if (err < 0) {
> - printk(KERN_ERR "%s: can't get IRQ %d\n", dev->name,
> - pci_dev->irq);
> - err = -EIO;
> - goto fail_irq;
> + /* irq bit */
> + if (saa7164_enable_msi(pci_dev, dev)) {
> + dev->msi = true;
> + } else {
> + /* if we have an error (i.e. we don't have an interrupt)
> + or msi is not enabled - fallback to shared interrupt */
> +
> + err = request_irq(pci_dev->irq, saa7164_irq,
> + IRQF_SHARED, dev->name, dev);
> +
> + if (err < 0) {
> + printk(KERN_ERR "%s: can't get IRQ %d\n", dev->name,
> + pci_dev->irq);
> + err = -EIO;
> + goto fail_irq;
> + }
> }
>
> pci_set_drvdata(pci_dev, dev);
> @@ -1439,6 +1486,11 @@ static void saa7164_finidev(struct pci_dev *pci_dev)
> /* unregister stuff */
> free_irq(pci_dev->irq, dev);
>
> + if (dev->msi) {
> + pci_disable_msi(pci_dev);
> + dev->msi = false;
> + }
> +
> pci_disable_device(pci_dev);
>
> mutex_lock(&devlist);
> diff --git a/drivers/media/pci/saa7164/saa7164.h b/drivers/media/pci/saa7164/saa7164.h
> index cd1a07c..75a3f51 100644
> --- a/drivers/media/pci/saa7164/saa7164.h
> +++ b/drivers/media/pci/saa7164/saa7164.h
> @@ -459,6 +459,7 @@ struct saa7164_dev {
> /* Interrupt status and ack registers */
> u32 int_status;
> u32 int_ack;
> + bool msi;
>
> struct cmd cmds[SAA_CMD_MAX_MSG_UNITS];
> struct mutex lock;
> --
> 1.9.1
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
Hi Kyle,
Great to hear you haven't had any problems since applying this patch!
I'm looking forward to seeing it in the Linux master branch too.
Version 5 of the patch has been accepted and committed to the media tree
by Mauro:
http://git.linuxtv.org/cgit.cgi/media_tree.git/commit/?id=77978089ddc90347644cc057e6b6cd169ac9abd4
I'm guessing it will therefore go in to the main Linux tree with the
release of kernel version v4.2? (or it can be submitted as a fix for
v4.1 - but I have no idea how a patch is selected on that criteria).
Hopefully someone can confirm or elaborate.
Regards,
Brendan McGrath
On 05/06/15 14:42, Kyle Sanderson wrote:
> This has been plaguing users for years (there's a number of threads on
> the Ubuntu board). I've been using revision 1 of the patch without
> issue since early February. This is from having to constantly reboot
> the system to flawless recording. If something has been outstanding
> from Brendan, please let me know and I'll happily make the requested
> changes.
>
> Can we please merge this? There are at-least three consumers in this
> thread alone that have confirmed this fixes the saa7164 driver for the
> HVR-2250 device.
> Kyle.
>
> PS: I can't seem to source out who owns this in the MAINTAINERS file?
>
> On Thu, Apr 9, 2015 at 11:39 PM, Brendan McGrath
> <[email protected]> wrote:
>> Enhances driver to use an MSI interrupt when available.
>>
>> Adds the module option 'enable_msi' (type bool) which by default is
>> enabled. Can be set to 'N' to disable.
>>
>> Fixes (or can reduce the occurrence of) a crash which is most commonly
>> reported when both digital tuners of the saa7164 chip is in use. A
>> reported example can be found here:
>> http://permalink.gmane.org/gmane.linux.drivers.video-input-infrastructure/83948
>>
>> Reviewed-by: Steven Toth <[email protected]>
>> Signed-off-by: Brendan McGrath <[email protected]>
>> ---
>> Changes since v4:
>> - improved readability by taking on suggestions made by Mauro
>> - the msi variable in the saa7164_dev structure is now a bool
>>
>> Thanks Mauro - good suggestions and I think I've taken on board all of them.
>>
>> drivers/media/pci/saa7164/saa7164-core.c | 66 ++++++++++++++++++++++++++++----
>> drivers/media/pci/saa7164/saa7164.h | 1 +
>> 2 files changed, 60 insertions(+), 7 deletions(-)
>>
>> diff --git a/drivers/media/pci/saa7164/saa7164-core.c b/drivers/media/pci/saa7164/saa7164-core.c
>> index 9cf3c6c..5e4a9f0 100644
>> --- a/drivers/media/pci/saa7164/saa7164-core.c
>> +++ b/drivers/media/pci/saa7164/saa7164-core.c
>> @@ -85,6 +85,11 @@ module_param(guard_checking, int, 0644);
>> MODULE_PARM_DESC(guard_checking,
>> "enable dma sanity checking for buffer overruns");
>>
>> +static bool enable_msi = true;
>> +module_param(enable_msi, bool, 0444);
>> +MODULE_PARM_DESC(enable_msi,
>> + "enable the use of an msi interrupt if available");
>> +
>> static unsigned int saa7164_devcount;
>>
>> static DEFINE_MUTEX(devlist);
>> @@ -1184,6 +1189,39 @@ static int saa7164_thread_function(void *data)
>> return 0;
>> }
>>
>> +static bool saa7164_enable_msi(struct pci_dev *pci_dev, struct saa7164_dev *dev)
>> +{
>> + int err;
>> +
>> + if (!enable_msi) {
>> + printk(KERN_WARNING "%s() MSI disabled by module parameter 'enable_msi'"
>> + , __func__);
>> + return false;
>> + }
>> +
>> + err = pci_enable_msi(pci_dev);
>> +
>> + if (err) {
>> + printk(KERN_ERR "%s() Failed to enable MSI interrupt."
>> + " Falling back to a shared IRQ\n", __func__);
>> + return false;
>> + }
>> +
>> + /* no error - so request an msi interrupt */
>> + err = request_irq(pci_dev->irq, saa7164_irq, 0,
>> + dev->name, dev);
>> +
>> + if (err) {
>> + /* fall back to legacy interrupt */
>> + printk(KERN_ERR "%s() Failed to get an MSI interrupt."
>> + " Falling back to a shared IRQ\n", __func__);
>> + pci_disable_msi(pci_dev);
>> + return false;
>> + }
>> +
>> + return true;
>> +}
>> +
>> static int saa7164_initdev(struct pci_dev *pci_dev,
>> const struct pci_device_id *pci_id)
>> {
>> @@ -1230,13 +1268,22 @@ static int saa7164_initdev(struct pci_dev *pci_dev,
>> goto fail_irq;
>> }
>>
>> - err = request_irq(pci_dev->irq, saa7164_irq,
>> - IRQF_SHARED, dev->name, dev);
>> - if (err < 0) {
>> - printk(KERN_ERR "%s: can't get IRQ %d\n", dev->name,
>> - pci_dev->irq);
>> - err = -EIO;
>> - goto fail_irq;
>> + /* irq bit */
>> + if (saa7164_enable_msi(pci_dev, dev)) {
>> + dev->msi = true;
>> + } else {
>> + /* if we have an error (i.e. we don't have an interrupt)
>> + or msi is not enabled - fallback to shared interrupt */
>> +
>> + err = request_irq(pci_dev->irq, saa7164_irq,
>> + IRQF_SHARED, dev->name, dev);
>> +
>> + if (err < 0) {
>> + printk(KERN_ERR "%s: can't get IRQ %d\n", dev->name,
>> + pci_dev->irq);
>> + err = -EIO;
>> + goto fail_irq;
>> + }
>> }
>>
>> pci_set_drvdata(pci_dev, dev);
>> @@ -1439,6 +1486,11 @@ static void saa7164_finidev(struct pci_dev *pci_dev)
>> /* unregister stuff */
>> free_irq(pci_dev->irq, dev);
>>
>> + if (dev->msi) {
>> + pci_disable_msi(pci_dev);
>> + dev->msi = false;
>> + }
>> +
>> pci_disable_device(pci_dev);
>>
>> mutex_lock(&devlist);
>> diff --git a/drivers/media/pci/saa7164/saa7164.h b/drivers/media/pci/saa7164/saa7164.h
>> index cd1a07c..75a3f51 100644
>> --- a/drivers/media/pci/saa7164/saa7164.h
>> +++ b/drivers/media/pci/saa7164/saa7164.h
>> @@ -459,6 +459,7 @@ struct saa7164_dev {
>> /* Interrupt status and ack registers */
>> u32 int_status;
>> u32 int_ack;
>> + bool msi;
>>
>> struct cmd cmds[SAA_CMD_MAX_MSG_UNITS];
>> struct mutex lock;
>> --
>> 1.9.1
>>
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
>> the body of a message to [email protected]
>> More majordomo info at http://vger.kernel.org/majordomo-info.html
>> Please read the FAQ at http://www.tux.org/lkml/