| Message ID | 20211018183930.8448-21-s.shtylyov@omp.ru (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Explicitly deny IRQ0 in the USB host drivers | expand |
On Mon, 2021-10-18 at 21:39 +0300, Sergey Shtylyov wrote: > If platform_get_irq() returns IRQ0 (considered invalid according to > Linus) > the driver blithely passes it to usb_add_hcd() that treats IRQ0 as no > IRQ > at all. Deny IRQ0 right away, returning -EINVAL from the probe() > method... > > Fixes: 0cbd4b34cda9 ("xhci: mediatek: support MTK xHCI host > controller") Fixes the following patch: 04284eb74e0c usb: xhci-mtk: add support runtime PM It introduced the 'host' irq > Signed-off-by: Sergey Shtylyov <s.shtylyov@omp.ru> > --- > drivers/usb/host/xhci-mtk.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/usb/host/xhci-mtk.c b/drivers/usb/host/xhci- > mtk.c > index c53f6f276d5c..d2dc8d9863ee 100644 > --- a/drivers/usb/host/xhci-mtk.c > +++ b/drivers/usb/host/xhci-mtk.c > @@ -495,7 +495,7 @@ static int xhci_mtk_probe(struct platform_device > *pdev) > return ret; > > irq = platform_get_irq_byname_optional(pdev, "host"); > - if (irq < 0) { > + if (irq <= 0) { > if (irq == -EPROBE_DEFER) > return irq; > > @@ -503,6 +503,8 @@ static int xhci_mtk_probe(struct platform_device > *pdev) > irq = platform_get_irq(pdev, 0); > if (irq < 0) > return irq; > + if (!irq) if (irq <= 0) ? Thanks > + return -EINVAL; > } > > wakeup_irq = platform_get_irq_byname_optional(pdev, "wakeup");
diff --git a/drivers/usb/host/xhci-mtk.c b/drivers/usb/host/xhci-mtk.c index c53f6f276d5c..d2dc8d9863ee 100644 --- a/drivers/usb/host/xhci-mtk.c +++ b/drivers/usb/host/xhci-mtk.c @@ -495,7 +495,7 @@ static int xhci_mtk_probe(struct platform_device *pdev) return ret; irq = platform_get_irq_byname_optional(pdev, "host"); - if (irq < 0) { + if (irq <= 0) { if (irq == -EPROBE_DEFER) return irq; @@ -503,6 +503,8 @@ static int xhci_mtk_probe(struct platform_device *pdev) irq = platform_get_irq(pdev, 0); if (irq < 0) return irq; + if (!irq) + return -EINVAL; } wakeup_irq = platform_get_irq_byname_optional(pdev, "wakeup");
If platform_get_irq() returns IRQ0 (considered invalid according to Linus) the driver blithely passes it to usb_add_hcd() that treats IRQ0 as no IRQ at all. Deny IRQ0 right away, returning -EINVAL from the probe() method... Fixes: 0cbd4b34cda9 ("xhci: mediatek: support MTK xHCI host controller") Signed-off-by: Sergey Shtylyov <s.shtylyov@omp.ru> --- drivers/usb/host/xhci-mtk.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)