{"id":831031,"url":"http://patchwork.ozlabs.org/api/1.2/patches/831031/?format=json","web_url":"http://patchwork.ozlabs.org/project/linuxppc-dev/patch/6c0df1bef980d1577a830db2f563a3fb20bc431f.1509071937.git.fthain@telegraphics.com.au/","project":{"id":2,"url":"http://patchwork.ozlabs.org/api/1.2/projects/2/?format=json","name":"Linux PPC development","link_name":"linuxppc-dev","list_id":"linuxppc-dev.lists.ozlabs.org","list_email":"linuxppc-dev@lists.ozlabs.org","web_url":"https://github.com/linuxppc/wiki/wiki","scm_url":"https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git","webscm_url":"https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git/","list_archive_url":"https://lore.kernel.org/linuxppc-dev/","list_archive_url_format":"https://lore.kernel.org/linuxppc-dev/{}/","commit_url_format":"https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git/commit/?id={}"},"msgid":"<6c0df1bef980d1577a830db2f563a3fb20bc431f.1509071937.git.fthain@telegraphics.com.au>","list_archive_url":"https://lore.kernel.org/linuxppc-dev/6c0df1bef980d1577a830db2f563a3fb20bc431f.1509071937.git.fthain@telegraphics.com.au/","date":"2017-10-27T02:45:24","name":"[4/4] m68k/mac: Add mutual exclusion for IOP interrupt polling","commit_ref":null,"pull_url":null,"state":"not-applicable","archived":false,"hash":"da05008b601b9596045aa4cad3e5b85c9be8a53c","submitter":{"id":2403,"url":"http://patchwork.ozlabs.org/api/1.2/people/2403/?format=json","name":"Finn Thain","email":"fthain@telegraphics.com.au"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/linuxppc-dev/patch/6c0df1bef980d1577a830db2f563a3fb20bc431f.1509071937.git.fthain@telegraphics.com.au/mbox/","series":[{"id":10477,"url":"http://patchwork.ozlabs.org/api/1.2/series/10477/?format=json","web_url":"http://patchwork.ozlabs.org/project/linuxppc-dev/list/?series=10477","date":"2017-10-27T02:45:24","name":null,"version":1,"mbox":"http://patchwork.ozlabs.org/series/10477/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/831031/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/831031/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":["patchwork-incoming@ozlabs.org","linuxppc-dev@lists.ozlabs.org"],"Delivered-To":["patchwork-incoming@ozlabs.org","linuxppc-dev@lists.ozlabs.org"],"Received":["from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3])\n\t(using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3yNT63273sz9s8J\n\tfor ;\n\tFri, 27 Oct 2017 13:56:11 +1100 (AEDT)","from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3])\n\tby lists.ozlabs.org (Postfix) with ESMTP id 3yNT6312pHzDrn8\n\tfor ;\n\tFri, 27 Oct 2017 13:56:11 +1100 (AEDT)","from kvm5.telegraphics.com.au (kvm5.telegraphics.com.au\n\t[98.124.60.144])\n\tby lists.ozlabs.org (Postfix) with ESMTP id 3yNT4l6Q0wzDrbl\n\tfor ;\n\tFri, 27 Oct 2017 13:55:03 +1100 (AEDT)","by kvm5.telegraphics.com.au (Postfix, from userid 502)\n\tid B36EA27DD8; Thu, 26 Oct 2017 22:45:24 -0400 (EDT)"],"Authentication-Results":"ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=telegraphics.com.au\n\t(client-ip=98.124.60.144; helo=kvm5.telegraphics.com.au;\n\tenvelope-from=fthain@telegraphics.com.au; receiver=)","X-Greylist":"delayed 576 seconds by postgrey-1.36 at bilbo;\n\tFri, 27 Oct 2017 13:55:03 AEDT","To":"Geert Uytterhoeven ","Message-Id":"<6c0df1bef980d1577a830db2f563a3fb20bc431f.1509071937.git.fthain@telegraphics.com.au>","In-Reply-To":"","References":"","From":"Finn Thain ","Subject":"[PATCH 4/4] m68k/mac: Add mutual exclusion for IOP interrupt polling","Date":"Thu, 26 Oct 2017 22:45:24 -0400 (EDT)","X-BeenThere":"linuxppc-dev@lists.ozlabs.org","X-Mailman-Version":"2.1.24","Precedence":"list","List-Id":"Linux on PowerPC Developers Mail List\n\t","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"linux-m68k@vger.kernel.org, linuxppc-dev@lists.ozlabs.org,\n\tlinux-kernel@vger.kernel.org","Errors-To":"linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org","Sender":"\"Linuxppc-dev\"\n\t"},"content":"The IOP interrupt handler iop_ism_irq() is used by the adb-iop\ndriver to poll for ADB request completion. Unfortunately, it is not\nre-entrant. Fix the race condition by adding an iop_ism_irq_poll()\nfunction with suitable mutual exclusion.\n\nTested-by: Stan Johnson \nSigned-off-by: Finn Thain \nCc: Benjamin Herrenschmidt \nCc: linuxppc-dev@lists.ozlabs.org\n---\n arch/m68k/include/asm/mac_iop.h | 1 +\n arch/m68k/mac/iop.c | 9 +++++++++\n drivers/macintosh/adb-iop.c | 4 +---\n 3 files changed, 11 insertions(+), 3 deletions(-)","diff":"diff --git a/arch/m68k/include/asm/mac_iop.h b/arch/m68k/include/asm/mac_iop.h\nindex 42566fd052bc..d2a08e004e2c 100644\n--- a/arch/m68k/include/asm/mac_iop.h\n+++ b/arch/m68k/include/asm/mac_iop.h\n@@ -158,6 +158,7 @@ extern void iop_complete_message(struct iop_msg *);\n extern void iop_upload_code(uint, __u8 *, uint, __u16);\n extern void iop_download_code(uint, __u8 *, uint, __u16);\n extern __u8 *iop_compare_code(uint, __u8 *, uint, __u16);\n+extern void iop_ism_irq_poll(uint);\n \n extern void iop_register_interrupts(void);\n \ndiff --git a/arch/m68k/mac/iop.c b/arch/m68k/mac/iop.c\nindex a2ea52db7d18..9bfa17015768 100644\n--- a/arch/m68k/mac/iop.c\n+++ b/arch/m68k/mac/iop.c\n@@ -598,3 +598,12 @@ irqreturn_t iop_ism_irq(int irq, void *dev_id)\n \t}\n \treturn IRQ_HANDLED;\n }\n+\n+void iop_ism_irq_poll(uint iop_num)\n+{\n+\tunsigned long flags;\n+\n+\tlocal_irq_save(flags);\n+\tiop_ism_irq(0, (void *)iop_num);\n+\tlocal_irq_restore(flags);\n+}\ndiff --git a/drivers/macintosh/adb-iop.c b/drivers/macintosh/adb-iop.c\nindex f5f4da3d0b67..4b0ad3995497 100644\n--- a/drivers/macintosh/adb-iop.c\n+++ b/drivers/macintosh/adb-iop.c\n@@ -29,8 +29,6 @@\n \n /*#define DEBUG_ADB_IOP*/\n \n-extern void iop_ism_irq(int, void *);\n-\n static struct adb_request *current_req;\n static struct adb_request *last_req;\n #if 0\n@@ -265,7 +263,7 @@ int adb_iop_autopoll(int devs)\n void adb_iop_poll(void)\n {\n \tif (adb_iop_state == idle) adb_iop_start();\n-\tiop_ism_irq(0, (void *) ADB_IOP);\n+\tiop_ism_irq_poll(ADB_IOP);\n }\n \n int adb_iop_reset_bus(void)\n","prefixes":["4/4"]}