| Message ID | 1423469774-6532-2-git-send-email-yoshihiro.shimoda.uh@renesas.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Geert Uytterhoeven |
| Headers | show |
Hi Shimoda-san, On Mon, Feb 9, 2015 at 9:16 AM, Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> wrote: > The usbhsf_pkt_handler(pipe, USBHSF_PKT_DMA_DONE) in usbhsf_dma_complete() > will call the complete function of a usb gadget driver finally. > According to the gadget.h, "The function will always be called with > interrupts disabled". > > So, this patch adds a local_irq_save/local_irq_restore in the > usbhsf_dma_complete() because a dmaengine driver may call this > callback function when interrupts enabled (e.g. in tasklet). > > Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> > --- > drivers/usb/renesas_usbhs/fifo.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/drivers/usb/renesas_usbhs/fifo.c b/drivers/usb/renesas_usbhs/fifo.c > index d891bff..b1440d0 100644 > --- a/drivers/usb/renesas_usbhs/fifo.c > +++ b/drivers/usb/renesas_usbhs/fifo.c > @@ -1165,11 +1165,14 @@ static void usbhsf_dma_complete(void *arg) > struct usbhs_priv *priv = usbhs_pipe_to_priv(pipe); > struct device *dev = usbhs_priv_to_dev(priv); > int ret; > + unsigned long flags; > > + local_irq_save(flags); Adding "local_irq_save()" without a spinlock is usually not correct. I'm a bit confused here. usbhsf_pkt_handler() itself calls usbhs_lock(priv, flags); which is actually spin_lock_irqsave(usbhs_priv_to_lock(priv), flags) so it does disable interrupts internally? Or is this about protecting the call to pkt->done(priv, pkt); at the end of usbhsf_pkt_handler(), which is done after releasing the spinlock? Still, that would need some better protection, as local_irq_save() disables interrupts only on the CPU it's running on, not on other CPUs in a multiprocessor system. > ret = usbhsf_pkt_handler(pipe, USBHSF_PKT_DMA_DONE); > if (ret < 0) > dev_err(dev, "dma_complete run_error %d : %d\n", > usbhs_pipe_number(pipe), ret); > + local_irq_restore(flags); > } > > void usbhs_fifo_clear_dcp(struct usbhs_pipe *pipe) > -- > 1.7.9.5 Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Geert-san, Thank you for the reply! > Hi Shimoda-san, > > On Mon, Feb 9, 2015 at 9:16 AM, Yoshihiro Shimoda > <yoshihiro.shimoda.uh@renesas.com> wrote: > > The usbhsf_pkt_handler(pipe, USBHSF_PKT_DMA_DONE) in usbhsf_dma_complete() > > will call the complete function of a usb gadget driver finally. > > According to the gadget.h, "The function will always be called with > > interrupts disabled". > > > > So, this patch adds a local_irq_save/local_irq_restore in the > > usbhsf_dma_complete() because a dmaengine driver may call this > > callback function when interrupts enabled (e.g. in tasklet). > > > > Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> > > --- > > drivers/usb/renesas_usbhs/fifo.c | 3 +++ > > 1 file changed, 3 insertions(+) > > > > diff --git a/drivers/usb/renesas_usbhs/fifo.c b/drivers/usb/renesas_usbhs/fifo.c > > index d891bff..b1440d0 100644 > > --- a/drivers/usb/renesas_usbhs/fifo.c > > +++ b/drivers/usb/renesas_usbhs/fifo.c > > @@ -1165,11 +1165,14 @@ static void usbhsf_dma_complete(void *arg) > > struct usbhs_priv *priv = usbhs_pipe_to_priv(pipe); > > struct device *dev = usbhs_priv_to_dev(priv); > > int ret; > > + unsigned long flags; > > > > + local_irq_save(flags); > > Adding "local_irq_save()" without a spinlock is usually not correct. > I'm a bit confused here. usbhsf_pkt_handler() itself calls > > usbhs_lock(priv, flags); > > which is actually > > spin_lock_irqsave(usbhs_priv_to_lock(priv), flags) > > so it does disable interrupts internally? Yes, it does. But.. > Or is this about protecting the call to > > pkt->done(priv, pkt); > > at the end of usbhsf_pkt_handler(), which is done after releasing the > spinlock? yes, I would like to protect pkt->done(priv, pkt) because it will call usb_gadget_giveback_request() in mod_gadget.c. Otherwise, an oops happens if I enabled CONFIG_DEBUG_SPINLOCK and used g_ncm. I copied the oops log at the end of this email. (After I loocked the log again, I should have described a commit log that this issue is caused from a gadget driver.) Also, this driver cannot protect pkt->done(priv, pkt) using usbhs_lock() because a gadget driver may call usb_ep_queue() in the complete function from usb_gadget_giveback_request(). So, a spinlock recursion will happen. > Still, that would need some better protection, as local_irq_save() disables > interrupts only on the CPU it's running on, not on other CPUs in a > multiprocessor system. I see. I will investigate this issue more. ======= oops log ======= BUG: spinlock recursion on CPU#0, irq/102-e65a000/546 lock: 0xee1f5d5c, .magic: dead4ead, .owner: irq/102-e65a000/546, .owner_cpu: 0 CPU: 0 PID: 546 Comm: irq/102-e65a000 Tainted: G W 3.19.0-rc4-01754-gfd5b84e-dirty #181 Hardware name: Generic R8A7791 (Flattened Device Tree) Backtrace: [<c0011e78>] (dump_backtrace) from [<c0012084>] (show_stack+0x18/0x1c) r6:00000000 r5:ee1f5d5c r4:00000000 r3:00208040 [<c001206c>] (show_stack) from [<c046c45c>] (dump_stack+0x7c/0x98) [<c046c3e0>] (dump_stack) from [<c046b754>] (spin_dump+0x80/0x94) r4:ee967240 r3:c0653334 [<c046b6d4>] (spin_dump) from [<c046b794>] (spin_bug+0x2c/0x30) r5:c059b229 r4:ee1f5d5c [<c046b768>] (spin_bug) from [<c005578c>] (do_raw_spin_lock+0x50/0x190) r5:0000000f r4:60000113 [<c005573c>] (do_raw_spin_lock) from [<c0470270>] (_raw_spin_lock_irqsave+0x18/0x20) r9:ee1f5d5c r8:ee1f5d40 r7:eeaea434 r6:00000000 r5:0000000f r4:60000113 [<c0470258>] (_raw_spin_lock_irqsave) from [<bf0006e8>] (eth_start_xmit+0xd0/0x37c [u_ether]) r4:ee1f5800 r3:00000000 [<bf000618>] (eth_start_xmit [u_ether]) from [<bf01b0e8>] (ncm_tx_tasklet+0x44/0x4c [usb_f_ncm]) r10:eea5fd38 r9:c06987c0 r8:00000000 r7:00000000 r6:c0653274 r5:00000000 r4:ee115600 [<bf01b0a4>] (ncm_tx_tasklet [usb_f_ncm]) from [<c0029868>] (tasklet_action+0x94/0xf4) r5:ee1156e0 r4:ee1156dc [<c00297d4>] (tasklet_action) from [<c0028f3c>] (__do_softirq+0xec/0x220) r8:c0658098 r7:00000100 r6:c0658088 r5:00000030 r4:eea5e000 r3:40000004 [<c0028e50>] (__do_softirq) from [<c00292ec>] (irq_exit+0x8c/0xfc) r10:00000002 r9:60000013 r8:00000001 r7:ee806000 r6:00000000 r5:c0653ac8 r4:00000000 [<c0029260>] (irq_exit) from [<c005b1d8>] (__handle_domain_irq+0x94/0xb8) r4:00000000 r3:000000a2 [<c005b144>] (__handle_domain_irq) from [<c0009394>] (gic_handle_irq+0x40/0x64) r8:eea4f8b0 r7:eea5fe1c r6:c065e95c r5:eea5fde8 r4:f0002000 r3:eea5fde8 [<c0009354>] (gic_handle_irq) from [<c0012bc0>] (__irq_svc+0x40/0x54) Exception stack(0xeea5fde8 to 0xeea5fe30) fde0: ee1f5d5c ac4aac49 ee0b65e4 ee1f5d40 ee1f5d40 ee0b65c0 fe00: eeb5b280 ee1f5d5c eea4f8b0 60000013 00000002 eea5fe4c eea5fe20 eea5fe30 fe20: c0470254 bf0005b8 60000013 ffffffff r6:ffffffff r5:60000013 r4:bf0005b8 r3:c0470254 [<bf000540>] (tx_complete [u_ether]) from [<c02d6a04>] (usb_gadget_giveback_request+0x14/0x18) r7:eea4f810 r6:ee8e206c r5:00000000 r4:ee0b65f4 [<c02d69f0>] (usb_gadget_giveback_request) from [<c02d5d14>] (usbhsg_queue_done+0x2c/0x30) [<c02d5ce8>] (usbhsg_queue_done) from [<c02d560c>] (usbhsf_pkt_handler+0xfc/0x114) [<c02d5510>] (usbhsf_pkt_handler) from [<c02d5644>] (usbhsf_dma_complete+0x20/0x58) r10:00000000 r9:00000001 r8:00200200 r7:00100100 r6:eeb118c8 r5:ee9a5a00 r4:ee8e206c [<c02d5624>] (usbhsf_dma_complete) from [<c01f1aec>] (usb_dmac_isr_channel_thread+0x8c/0xcc) r5:eeb11894 r4:ee9e852c [<c01f1a60>] (usb_dmac_isr_channel_thread) from [<c005c2ec>] (irq_thread_fn+0x24/0x3c) r8:c005c2c8 r7:ee1bbfa0 r6:ee998640 r5:eea5e000 r4:ee1bbf80 r3:c01f1a60 [<c005c2c8>] (irq_thread_fn) from [<c005c5c0>] (irq_thread+0xf4/0x16c) r6:ee1bbf80 r5:eea5e000 r4:ee998640 r3:00000004 [<c005c4cc>] (irq_thread) from [<c003d7b4>] (kthread+0xf0/0x104) r10:00000000 r9:00000000 r8:00000000 r7:c005c4cc r6:ee1bbf80 r5:00000000 r4:ee1bbf40 [<c003d6c4>] (kthread) from [<c000ebd8>] (ret_from_fork+0x14/0x3c) r7:00000000 r6:00000000 r5:c003d6c4 r4:ee1bbf40 BUG: spinlock lockup suspected on CPU#1, iperf/2473 lock: 0xee1f5d5c, .magic: dead4ead, .owner: irq/102-e65a000/546, .owner_cpu: 0 CPU: 1 PID: 2473 Comm: iperf Tainted: G W 3.19.0-rc4-01754-gfd5b84e-dirty #181 Hardware name: Generic R8A7791 (Flattened Device Tree) Backtrace: [<c0011e78>] (dump_backtrace) from [<c0012084>] (show_stack+0x18/0x1c) r6:00989680 r5:ee1f5d5c r4:00000000 r3:00404040 [<c001206c>] (show_stack) from [<c046c45c>] (dump_stack+0x7c/0x98) [<c046c3e0>] (dump_stack) from [<c046b754>] (spin_dump+0x80/0x94) r4:ee967240 r3:c0653334 [<c046b6d4>] (spin_dump) from [<c0055878>] (do_raw_spin_lock+0x13c/0x190) r5:00000000 r4:00989680 [<c005573c>] (do_raw_spin_lock) from [<c0470270>] (_raw_spin_lock_irqsave+0x18/0x20) r9:ee1f5d5c r8:ee1f5d40 r7:eeaea434 r6:ee28f580 r5:0000000f r4:20000013 [<c0470258>] (_raw_spin_lock_irqsave) from [<bf0006e8>] (eth_start_xmit+0xd0/0x37c [u_ether]) r4:ee1f5800 r3:00000001 [<bf000618>] (eth_start_xmit [u_ether]) from [<c0396c70>] (dev_hard_start_xmit+0x250/0x2e8) r10:ee346c60 r9:ee2a2100 r8:ee1f5800 r7:00000000 r6:ee346c00 r5:ee28f580 r4:00000001 [<c0396a20>] (dev_hard_start_xmit) from [<c03aeb58>] (sch_direct_xmit+0xa8/0x1d0) r10:ee346c60 r9:ee1f5800 r8:ee28f580 r7:ee2a2100 r6:ee346c00 r5:ee346c00 r4:00000001 [<c03aeab0>] (sch_direct_xmit) from [<c0396f54>] (__dev_queue_xmit+0x24c/0x498) r10:ee346c60 r9:00000000 r8:00000000 r7:ee2a2100 r6:ee1f5800 r5:ee346c00 r4:ee28f580 [<c0396d08>] (__dev_queue_xmit) from [<c03971b4>] (dev_queue_xmit+0x14/0x18) r10:00000000 r9:ee3380cc r8:ee3380bc r7:00000000 r6:ee28f580 r5:0000000e r4:ee338000 [<c03971a0>] (dev_queue_xmit) from [<c03bd1e8>] (ip_finish_output+0x8e4/0x96c) [<c03bc904>] (ip_finish_output) from [<c03be674>] (ip_output+0xa8/0xb4) r9:001105c6 r8:00000000 r7:eeaabef0 r6:eeaabc80 r5:ee1f5800 r4:ee28f580 [<c03be5cc>] (ip_output) from [<c03bdf0c>] (ip_local_out_sk+0x3c/0x40) r5:eeaabc80 r4:ee28f580 [<c03bded0>] (ip_local_out_sk) from [<c03bf0cc>] (ip_send_skb+0x18/0xa0) r5:c068f3c0 r4:ee28f580 [<c03bf0b4>] (ip_send_skb) from [<c03df984>] (udp_send_skb+0x188/0x234) r5:edc0f824 r4:ee28f580 [<c03df7fc>] (udp_send_skb) from [<c03e1944>] (udp_sendmsg+0x4f0/0x6dc) r9:00008913 r8:000005be r7:eeaabef0 r6:1616a8c0 r5:ee95be84 r4:eeaabc80 [<c03e1454>] (udp_sendmsg) from [<c03ea704>] (inet_sendmsg+0x84/0xb4) r10:00000000 r9:0001e5b0 r8:ee326100 r7:000005be r6:ee95be84 r5:ee95bee8 r4:eeaabc80 [<c03ea680>] (inet_sendmsg) from [<c037fd30>] (sock_aio_write+0xe4/0xf4) r7:ee95be64 r6:ee95bee8 r5:ee40a580 r4:000005be [<c037fc4c>] (sock_aio_write) from [<c00c7b3c>] (do_sync_write+0x74/0x98) r8:000005be r7:ee326100 r6:ee95bf78 r5:00000000 r4:00000000 [<c00c7ac8>] (do_sync_write) from [<c00c83e0>] (vfs_write+0xe4/0x194) r8:000005be r7:000005be r6:ee95bf78 r5:0001e5b0 r4:ee326100 [<c00c82fc>] (vfs_write) from [<c00c8980>] (SyS_write+0x44/0x84) r9:0001e5b0 r8:000005be r7:ee326101 r6:ee326100 r5:00000000 r4:00000000 [<c00c893c>] (SyS_write) from [<c000eb40>] (ret_fast_syscall+0x0/0x30) r9:ee95a000 r8:c000ece4 r7:00000004 r6:ffffc3ef r5:0001eb78 r4:0001e1c8 ===================== Best regards, Yoshihiro Shimoda > > ret = usbhsf_pkt_handler(pipe, USBHSF_PKT_DMA_DONE); > > if (ret < 0) > > dev_err(dev, "dma_complete run_error %d : %d\n", > > usbhs_pipe_number(pipe), ret); > > + local_irq_restore(flags); > > } > > > > void usbhs_fifo_clear_dcp(struct usbhs_pipe *pipe) > > -- > > 1.7.9.5 > > Gr{oetje,eeting}s, > > Geert > > -- > Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org > > In personal conversations with technical people, I call myself a hacker. But > when I'm talking to journalists I just say "programmer" or something like that. > -- Linus Torvalds
SGkgR2VlcnQtc2FuLA0KDQo+ID4gU3RpbGwsIHRoYXQgd291bGQgbmVlZCBzb21lIGJldHRlciBw cm90ZWN0aW9uLCBhcyBsb2NhbF9pcnFfc2F2ZSgpIGRpc2FibGVzDQo+ID4gaW50ZXJydXB0cyBv bmx5IG9uIHRoZSBDUFUgaXQncyBydW5uaW5nIG9uLCBub3Qgb24gb3RoZXIgQ1BVcyBpbiBhDQo+ ID4gbXVsdGlwcm9jZXNzb3Igc3lzdGVtLg0KPiANCj4gSSBzZWUuIEkgd2lsbCBpbnZlc3RpZ2F0 ZSB0aGlzIGlzc3VlIG1vcmUuDQoNCkkgdHJpZWQgdGhpcyBpc3N1ZSBvbiB2My4xOSB3aXRoIGRt YWMgZW5hYmxlZCwgaXQgYWxzbyBjYXVzZWQgYW4gb29wcy4NCkhvd2V2ZXIsIHRoZSBsb2cgaXMg dXNlZnVsIHRvIGludmVzdGlnYXRlIHRoaXMgaXNzdWUuDQpUaGlzIGlzc3VlIGlzIGNhdXNlZCBi eSB0eF9jb21wbGV0ZSgpIGFuZCBuY21fdHhfdGFza2xldCgpIGJlY2F1c2UNCnRoZSByZW5lc2Fz X3VzYmhzIGRyaXZlciBjYWxsZWQgdXNiX2dhZGdldF9naXZlYmFja19yZXF1ZXN0IHdpdGgNCmlu dGVycnVwdHMgZW5hYmxlZC4gU28sIHNwaW5fbG9ja19pcnFzYXZlKCZkZXYtPnJlcV9sb2NrLCBm bGFncykgaW4NCnVfZXRoZXIuYyBpcyBoZWxkLg0KDQpTbywgSSB3aWxsIHN1Ym1pdCBhIHBhdGNo IHYyIGFzIHRoZSBmb2xsb3dpbmdzLiBXaGF0IGRvIHlvdSB0aGluaz8NCg0KLS0NClN1YmplY3Q6 IFtQQVRDSF0gdXNiOiByZW5lc2FzX3VzYmhzOiBmaXggc3BpbmxvY2sgc3VzcGVjdGVkIGluIGEg Z2FkZ2V0IGNvbXBsZXRlIGZ1bmN0aW9uDQoNCkFjY29yZGluZyB0byB0aGUgZ2FkZ2V0LmgsIGEg ImNvbXBsZXRlIiBmdW5jdGlvbiB3aWxsIGFsd2F5cyBiZSBjYWxsZWQNCndpdGggaW50ZXJydXB0 cyBkaXNhYmxlZC4gSG93ZXZlciwgc29tZXRpbWVzIHVzYmhzZ19xdWV1ZV9wb3AoKSBmdW5jdGlv bg0KaXMgY2FsbGVkIHdpdGggaW50ZXJydXB0cyBlbmFibGVkLiBTbywgdGhpcyBmdW5jdGlvbiBz aG91bGQgY2FsbHMNCmxvY2FsX2lycV9zYXZlKCkgYmVmb3JlIHRoaXMgY2FsbHMgdGhlIHVzYl9n YWRnZXRfZ2l2ZWJhY2tfcmVxdWVzdCgpLg0KT3RoZXJ3aXNlLCB0aGVyZSBpcyBwb3NzaWJsZSB0 byBjYXVzZSBhIHNwaW5sb2NrIHN1c3BlY3RlZCBpbiBhIGdhZGdldA0KY29tcGxldGUgZnVuY3Rp b24uDQoNClNpZ25lZC1vZmYtYnk6IFlvc2hpaGlybyBTaGltb2RhIDx5b3NoaWhpcm8uc2hpbW9k YS51aEByZW5lc2FzLmNvbT4NCi0tLQ0KIGRyaXZlcnMvdXNiL3JlbmVzYXNfdXNiaHMvbW9kX2dh ZGdldC5jIHwgICAxMSArKysrKysrKysrKw0KIDEgZmlsZSBjaGFuZ2VkLCAxMSBpbnNlcnRpb25z KCspDQoNCmRpZmYgLS1naXQgYS9kcml2ZXJzL3VzYi9yZW5lc2FzX3VzYmhzL21vZF9nYWRnZXQu YyBiL2RyaXZlcnMvdXNiL3JlbmVzYXNfdXNiaHMvbW9kX2dhZGdldC5jDQppbmRleCBlMDM4NGFm Li4xMDRiZGRmIDEwMDY0NA0KLS0tIGEvZHJpdmVycy91c2IvcmVuZXNhc191c2Jocy9tb2RfZ2Fk Z2V0LmMNCisrKyBiL2RyaXZlcnMvdXNiL3JlbmVzYXNfdXNiaHMvbW9kX2dhZGdldC5jDQpAQCAt MTI2LDExICsxMjYsMjIgQEAgc3RhdGljIHZvaWQgdXNiaHNnX3F1ZXVlX3BvcChzdHJ1Y3QgdXNi aHNnX3VlcCAqdWVwLA0KIAlzdHJ1Y3QgdXNiaHNnX2dwcml2ICpncHJpdiA9IHVzYmhzZ191ZXBf dG9fZ3ByaXYodWVwKTsNCiAJc3RydWN0IHVzYmhzX3BpcGUgKnBpcGUgPSB1c2Joc2dfdWVwX3Rv X3BpcGUodWVwKTsNCiAJc3RydWN0IGRldmljZSAqZGV2ID0gdXNiaHNnX2dwcml2X3RvX2Rldihn cHJpdik7DQorCXVuc2lnbmVkIGxvbmcgZmxhZ3M7DQogDQogCWRldl9kYmcoZGV2LCAicGlwZSAl ZCA6IHF1ZXVlIHBvcFxuIiwgdXNiaHNfcGlwZV9udW1iZXIocGlwZSkpOw0KIA0KIAl1cmVxLT5y ZXEuc3RhdHVzID0gc3RhdHVzOw0KKwkvKg0KKwkgKiBBY2NvcmRpbmcgdG8gdGhlIGdhZGdldC5o LCBhICJjb21wbGV0ZSIgZnVuY3Rpb24gd2lsbCBhbHdheXMgYmUNCisJICogY2FsbGVkIHdpdGgg aW50ZXJydXB0cyBkaXNhYmxlZC4gSG93ZXZlciwgc29tZXRpbWVzIHRoaXMgZnVuY3Rpb24NCisJ ICogaXMgY2FsbGVkIHdpdGggaW50ZXJydXB0cyBlbmFibGVkLiAoZS5nLiBjb21wbGV0ZSBhIERN QUMgdHJhbnNmZXIgb3INCisJICogd3JpdGUgZGF0YSBhbmQgZG9uZSBpcyBzZXQgaW1tZWRpYXRl bHkgd2hlbiBQSU8uKSBTbywgdGhpcyBmdW5jdGlvbg0KKwkgKiBzaG91bGQgY2FsbHMgbG9jYWxf aXJxX3NhdmUoKSBiZWZvcmUgdGhpcyBjYWxscyB0aGUNCisJICogdXNiX2dhZGdldF9naXZlYmFj a19yZXF1ZXN0KCkuDQorCSAqLw0KKwlsb2NhbF9pcnFfc2F2ZShmbGFncyk7DQogCXVzYl9nYWRn ZXRfZ2l2ZWJhY2tfcmVxdWVzdCgmdWVwLT5lcCwgJnVyZXEtPnJlcSk7DQorCWxvY2FsX2lycV9y ZXN0b3JlKGZsYWdzKTsNCiB9DQogDQogc3RhdGljIHZvaWQgdXNiaHNnX3F1ZXVlX2RvbmUoc3Ry dWN0IHVzYmhzX3ByaXYgKnByaXYsIHN0cnVjdCB1c2Joc19wa3QgKnBrdCkNCg0KPT09PT09PSBv b3BzIGxvZyBvbiB2My4xOSArIGRtYWMgPT09PT09PQ0KQlVHOiBzcGlubG9jayBsb2NrdXAgc3Vz cGVjdGVkIG9uIENQVSMwLCBpcnEvMTAyLWU2NWEwMDAvNTQ3DQogbG9jazogMHhlZWEyZGQ1Yywg Lm1hZ2ljOiBkZWFkNGVhZCwgLm93bmVyOiA8bm9uZT4vLTEsIC5vd25lcl9jcHU6IC0xDQpDUFU6 IDAgUElEOiA1NDcgQ29tbTogaXJxLzEwMi1lNjVhMDAwIFRhaW50ZWQ6IEcgICAgICAgIFcgICAg ICAzLjE5LjAtMDU2MzQtZzExMzcxZDctZGlydHkgIzU1DQpIYXJkd2FyZSBuYW1lOiBHZW5lcmlj IFI4QTc3OTEgKEZsYXR0ZW5lZCBEZXZpY2UgVHJlZSkNCkJhY2t0cmFjZToNCls8YzAwMTFlNzg+ XSAoZHVtcF9iYWNrdHJhY2UpIGZyb20gWzxjMDAxMjA4ND5dIChzaG93X3N0YWNrKzB4MTgvMHgx YykNCiByNjowMDk4OTY4MCByNTplZWEyZGQ1YyByNDowMDAwMDAwMCByMzowMDIwODA0MA0KWzxj MDAxMjA2Yz5dIChzaG93X3N0YWNrKSBmcm9tIFs8YzA0NzEzMzg+XSAoZHVtcF9zdGFjaysweDdj LzB4OTgpDQpbPGMwNDcxMmJjPl0gKGR1bXBfc3RhY2spIGZyb20gWzxjMDQ3MDYzMD5dIChzcGlu X2R1bXArMHg4MC8weDk0KQ0KIHI0OjAwMDAwMDAwIHIzOmMwNjcxMzM0DQpbPGMwNDcwNWIwPl0g KHNwaW5fZHVtcCkgZnJvbSBbPGMwMDU1OTEwPl0gKGRvX3Jhd19zcGluX2xvY2srMHgxM2MvMHgx OTApDQogcjU6MDAwMDAwMDAgcjQ6MDA5ODk2ODANCls8YzAwNTU3ZDQ+XSAoZG9fcmF3X3NwaW5f bG9jaykgZnJvbSBbPGMwNDc1MWMwPl0gKF9yYXdfc3Bpbl9sb2NrX2lycXNhdmUrMHgxOC8weDIw KQ0KIHI5OmVlYTJkZDVjIHI4OmVlYTJkZDQwIHI3OmVlYmFhMDM0IHI2OjAwMDAwMDAwIHI1OjAw MDAwMDBmIHI0OjYwMDAwMTEzDQpbPGMwNDc1MWE4Pl0gKF9yYXdfc3Bpbl9sb2NrX2lycXNhdmUp IGZyb20gWzxiZjAwMDZiYz5dIChldGhfc3RhcnRfeG1pdCsweGQwLzB4MzdjIFt1X2V0aGVyXSkN CiByNDplZWEyZDgwMCByMzowMDAwMDAwMA0KWzxiZjAwMDVlYz5dIChldGhfc3RhcnRfeG1pdCBb dV9ldGhlcl0pIGZyb20gWzxiZjAxYjBlOD5dIChuY21fdHhfdGFza2xldCsweDQ0LzB4NGMgW3Vz Yl9mX25jbV0pDQogcjEwOmVlYjg3ZDAwIHI5OmMwNmI2YjAwIHI4OjAwMDAwMDAwIHI3OjAwMDAw MDAwIHI2OmMwNjcxMjc0IHI1OjAwMDAwMDAwDQogcjQ6ZWUwZjhlMDANCls8YmYwMWIwYTQ+XSAo bmNtX3R4X3Rhc2tsZXQgW3VzYl9mX25jbV0pIGZyb20gWzxjMDAyOTg1ND5dICh0YXNrbGV0X2Fj dGlvbisweDk0LzB4ZjQpDQogcjU6ZWUwZjhlZTAgcjQ6ZWUwZjhlZGMNCls8YzAwMjk3YzA+XSAo dGFza2xldF9hY3Rpb24pIGZyb20gWzxjMDAyOGYyOD5dIChfX2RvX3NvZnRpcnErMHhlYy8weDIy MCkNCiByODpjMDY3NjA5OCByNzowMDAwMDEwMCByNjpjMDY3NjA4OCByNTowMDAwMDAzMCByNDpl ZWI4NjAwMCByMzo0MDAwMDAwNA0KWzxjMDAyOGUzYz5dIChfX2RvX3NvZnRpcnEpIGZyb20gWzxj MDAyOTJkOD5dIChpcnFfZXhpdCsweDhjLzB4ZmMpDQogcjEwOjAwMDAwMDAyIHI5OjYwMDAwMDEz IHI4OjAwMDAwMDAxIHI3OmVlODA2MDAwIHI2OjAwMDAwMDAwIHI1OmMwNjcxYWM4DQogcjQ6MDAw MDAwMDANCls8YzAwMjkyNGM+XSAoaXJxX2V4aXQpIGZyb20gWzxjMDA1YjI3MD5dIChfX2hhbmRs ZV9kb21haW5faXJxKzB4OTQvMHhiOCkNCiByNDowMDAwMDAwMCByMzowMDAwMDE4ZQ0KWzxjMDA1 YjFkYz5dIChfX2hhbmRsZV9kb21haW5faXJxKSBmcm9tIFs8YzAwMDkzOTQ+XSAoZ2ljX2hhbmRs ZV9pcnErMHg0MC8weDY0KQ0KIHI4OmVlYTJkZDVjIHI3OmVlYjg3ZGU0IHI2OmMwNjdjOTY0IHI1 OmVlYjg3ZGIwIHI0OmYwMDAyMDAwIHIzOmVlYjg3ZGIwDQpbPGMwMDA5MzU0Pl0gKGdpY19oYW5k bGVfaXJxKSBmcm9tIFs8YzAwMTJiYzA+XSAoX19pcnFfc3ZjKzB4NDAvMHg1NCkNCkV4Y2VwdGlv biBzdGFjaygweGVlYjg3ZGIwIHRvIDB4ZWViODdkZjgpDQo3ZGEwOiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBlZWEyZGQ1YyBhYTA1YWEwNCAwMDAwMDAwMCAwMDAwMDAwMA0K N2RjMDogZWVhMmRkNDAgZWUwYmUxYzAgZWUxODBlODAgZWVhMmRkNWMgZWVhMmRkNWMgNjAwMDAw MTMgMDAwMDAwMDIgZWViODdlMWMNCjdkZTA6IGVlYjg3ZTIwIGVlYjg3ZGY4IGMwNDc1MWE0IGMw MDU1ODZjIDYwMDAwMDEzIGZmZmZmZmZmDQogcjY6ZmZmZmZmZmYgcjU6NjAwMDAwMTMgcjQ6YzAw NTU4NmMgcjM6YzA0NzUxYTQNCls8YzAwNTU3ZDQ+XSAoZG9fcmF3X3NwaW5fbG9jaykgZnJvbSBb PGMwNDc1MWE0Pl0gKF9yYXdfc3Bpbl9sb2NrKzB4MTAvMHgxNCkNCiByOTo2MDAwMDAxMyByODpl ZTFkM2FiNCByNzplZWEyZGQ1YyByNjplZTE4MGU4MCByNTplZTBiZTFjMCByNDplZWEyZGQ0MA0K WzxjMDQ3NTE5ND5dIChfcmF3X3NwaW5fbG9jaykgZnJvbSBbPGJmMDAwNTg0Pl0gKHR4X2NvbXBs ZXRlKzB4NzAvMHhkOCBbdV9ldGhlcl0pDQpbPGJmMDAwNTE0Pl0gKHR4X2NvbXBsZXRlIFt1X2V0 aGVyXSkgZnJvbSBbPGMwMmQ5NmM4Pl0gKHVzYl9nYWRnZXRfZ2l2ZWJhY2tfcmVxdWVzdCsweDE0 LzB4MTgpDQogcjc6ZWUxZDNhMTAgcjY6ZWViYWE4NmMgcjU6MDAwMDAwMDAgcjQ6ZWUwYmUxZjQN Cls8YzAyZDk2YjQ+XSAodXNiX2dhZGdldF9naXZlYmFja19yZXF1ZXN0KSBmcm9tIFs8YzAyZDg5 ZDg+XSAodXNiaHNnX3F1ZXVlX2RvbmUrMHgyYy8weDMwKQ0KWzxjMDJkODlhYz5dICh1c2Joc2df cXVldWVfZG9uZSkgZnJvbSBbPGMwMmQ4MmJjPl0gKHVzYmhzZl9wa3RfaGFuZGxlcisweGZjLzB4 MTE0KQ0KWzxjMDJkODFjMD5dICh1c2Joc2ZfcGt0X2hhbmRsZXIpIGZyb20gWzxjMDJkODJmND5d ICh1c2Joc2ZfZG1hX2NvbXBsZXRlKzB4MjAvMHg1OCkNCiByMTA6MDAwMDAwMDAgcjk6MDAwMDAw MDEgcjg6MDAyMDAyMDAgcjc6MDAxMDAxMDAgcjY6ZWViYzZjYzggcjU6ZWU5YTZhMDANCiByNDpl ZWJhYTg2Yw0KWzxjMDJkODJkND5dICh1c2Joc2ZfZG1hX2NvbXBsZXRlKSBmcm9tIFs8YzAxZjJl ZmM+XSAodXNiX2RtYWNfaXNyX2NoYW5uZWxfdGhyZWFkKzB4OGMvMHhjYykNCiByNTplZWJjNmM5 NCByNDplZTI4OTU2Yw0KWzxjMDFmMmU3MD5dICh1c2JfZG1hY19pc3JfY2hhbm5lbF90aHJlYWQp IGZyb20gWzxjMDA1YzM4ND5dIChpcnFfdGhyZWFkX2ZuKzB4MjQvMHgzYykNCiByODpjMDA1YzM2 MCByNzplZThmNjY2MCByNjplZTk5OTY0MCByNTplZWI4NjAwMCByNDplZThmNjY0MCByMzpjMDFm MmU3MA0KWzxjMDA1YzM2MD5dIChpcnFfdGhyZWFkX2ZuKSBmcm9tIFs8YzAwNWM2NTg+XSAoaXJx X3RocmVhZCsweGY0LzB4MTZjKQ0KIHI2OmVlOGY2NjQwIHI1OmVlYjg2MDAwIHI0OmVlOTk5NjQw IHIzOjAwMDAwMDA0DQpbPGMwMDVjNTY0Pl0gKGlycV90aHJlYWQpIGZyb20gWzxjMDAzZDgzND5d IChrdGhyZWFkKzB4ZjAvMHgxMDQpDQogcjEwOjAwMDAwMDAwIHI5OjAwMDAwMDAwIHI4OjAwMDAw MDAwIHI3OmMwMDVjNTY0IHI2OmVlOGY2NjQwIHI1OjAwMDAwMDAwDQogcjQ6ZWU4ZjY2MDANCls8 YzAwM2Q3NDQ+XSAoa3RocmVhZCkgZnJvbSBbPGMwMDBlYmUwPl0gKHJldF9mcm9tX2ZvcmsrMHgx NC8weDM0KQ0KIHI3OjAwMDAwMDAwIHI2OjAwMDAwMDAwIHI1OmMwMDNkNzQ0IHI0OmVlOGY2NjAw DQo9PT09PT09PT09PT09PT09PT09PT0NCg0KQmVzdCByZWdhcmRzLA0KWW9zaGloaXJvIFNoaW1v ZGENCg0K -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/usb/renesas_usbhs/fifo.c b/drivers/usb/renesas_usbhs/fifo.c index d891bff..b1440d0 100644 --- a/drivers/usb/renesas_usbhs/fifo.c +++ b/drivers/usb/renesas_usbhs/fifo.c @@ -1165,11 +1165,14 @@ static void usbhsf_dma_complete(void *arg) struct usbhs_priv *priv = usbhs_pipe_to_priv(pipe); struct device *dev = usbhs_priv_to_dev(priv); int ret; + unsigned long flags; + local_irq_save(flags); ret = usbhsf_pkt_handler(pipe, USBHSF_PKT_DMA_DONE); if (ret < 0) dev_err(dev, "dma_complete run_error %d : %d\n", usbhs_pipe_number(pipe), ret); + local_irq_restore(flags); } void usbhs_fifo_clear_dcp(struct usbhs_pipe *pipe)
The usbhsf_pkt_handler(pipe, USBHSF_PKT_DMA_DONE) in usbhsf_dma_complete() will call the complete function of a usb gadget driver finally. According to the gadget.h, "The function will always be called with interrupts disabled". So, this patch adds a local_irq_save/local_irq_restore in the usbhsf_dma_complete() because a dmaengine driver may call this callback function when interrupts enabled (e.g. in tasklet). Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> --- drivers/usb/renesas_usbhs/fifo.c | 3 +++ 1 file changed, 3 insertions(+)