From patchwork Thu Jul 5 23:12:40 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Vorontsov X-Patchwork-Id: 1162451 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id 6091C3FE4F for ; Thu, 5 Jul 2012 23:22:40 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1SmvJn-0003kI-U8; Thu, 05 Jul 2012 23:18:40 +0000 Received: from mail-pb0-f49.google.com ([209.85.160.49]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1SmvGh-0003GT-RG for linux-arm-kernel@lists.infradead.org; Thu, 05 Jul 2012 23:15:33 +0000 Received: by mail-pb0-f49.google.com with SMTP id rq13so15061702pbb.36 for ; Thu, 05 Jul 2012 16:15:15 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=E1mdTXii30twc4sAOO3Dyd2WQ7Y9NADO7+9FOVp+JLk=; b=PmQWclGzFa1xZRa1bz8Aefq5i9d+zvvQzP7S0r4WFPMKYI4JEF59hJuyZwpoH8aHdA 55xt83lAbtZ/mbNDFyFbSS4IzTHDLcJ6u6CZHkawIekvYFyibRqaT3imJFH/uus698GR uXJJiymAArpRYlnFKaAQfZRHTzuYOVkzBEO5D2XpFqQuY2DoiXcDPZux4Pup51PJ/Kv3 7fPt0sS9w2epZIfVpH1w/3eUZ82k9v00OFIP70pSGcBmyjsV1tfcUAm9QYIi54Y9jGrw P6RnTDcrnT6STpc5LbO2AWawheuBfbN4LDookADm3/9VK7qBzxqiY0P6ItoDJ93hgW// otDQ== Received: by 10.68.220.104 with SMTP id pv8mr31603830pbc.119.1341530115702; Thu, 05 Jul 2012 16:15:15 -0700 (PDT) Received: from localhost (c-71-204-165-222.hsd1.ca.comcast.net. [71.204.165.222]) by mx.google.com with ESMTPS id gh9sm8049931pbc.20.2012.07.05.16.15.14 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 05 Jul 2012 16:15:15 -0700 (PDT) From: Anton Vorontsov To: Russell King , Jason Wessel Subject: [PATCH 6/6] ARM: versatile: Make able to use UART ports for KGDB FIQ debugger Date: Thu, 5 Jul 2012 16:12:40 -0700 Message-Id: <1341529960-18370-6-git-send-email-anton.vorontsov@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <20120705231034.GA16931@lizard> References: <20120705231034.GA16931@lizard> X-Gm-Message-State: ALoCoQm34uL7y5pdIFz6pnQIwjZ+71e/KPZZFN+lo5vzEMdEGXPnRaMdc3LL8/KpMA42/ZOnFmYr X-Spam-Note: CRM114 invocation failed X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.160.49 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: linaro-kernel@lists.linaro.org, patches@linaro.org, kgdb-bugreport@lists.sourceforge.net, linux-kernel@vger.kernel.org, =?UTF-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= , John Stultz , Colin Cross , kernel-team@android.com, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org If enabled, kernel will able to enter KGDB upon serial line activity on UART ports. Note that even with this patch and CONFIG_KGDB_FIQ is enabled, you still need to pass kgdb_fiq.enable=1 kernel command line option, otherwise UART will behave in a normal way. By default UART0 is used, but this can be changed via kgdb_fiq.uart_num kernel command line option. Signed-off-by: Anton Vorontsov --- arch/arm/mach-versatile/Makefile | 1 + arch/arm/mach-versatile/include/mach/irqs.h | 1 + arch/arm/mach-versatile/kgdb_fiq.c | 40 +++++++++++++++++++++++++++ 3 files changed, 42 insertions(+) create mode 100644 arch/arm/mach-versatile/kgdb_fiq.c diff --git a/arch/arm/mach-versatile/Makefile b/arch/arm/mach-versatile/Makefile index 81fa3fe..bfd761f 100644 --- a/arch/arm/mach-versatile/Makefile +++ b/arch/arm/mach-versatile/Makefile @@ -7,3 +7,4 @@ obj-$(CONFIG_ARCH_VERSATILE_PB) += versatile_pb.o obj-$(CONFIG_MACH_VERSATILE_AB) += versatile_ab.o obj-$(CONFIG_MACH_VERSATILE_DT) += versatile_dt.o obj-$(CONFIG_PCI) += pci.o +obj-$(CONFIG_KGDB_FIQ) += kgdb_fiq.o diff --git a/arch/arm/mach-versatile/include/mach/irqs.h b/arch/arm/mach-versatile/include/mach/irqs.h index bf44c61..fcd2a95 100644 --- a/arch/arm/mach-versatile/include/mach/irqs.h +++ b/arch/arm/mach-versatile/include/mach/irqs.h @@ -26,6 +26,7 @@ * held within platform.h */ #define IRQ_VIC_START 0 +#define FIQ_START IRQ_VIC_START #define IRQ_WDOGINT (IRQ_VIC_START + INT_WDOGINT) #define IRQ_SOFTINT (IRQ_VIC_START + INT_SOFTINT) #define IRQ_COMMRx (IRQ_VIC_START + INT_COMMRx) diff --git a/arch/arm/mach-versatile/kgdb_fiq.c b/arch/arm/mach-versatile/kgdb_fiq.c new file mode 100644 index 0000000..c82e8ce --- /dev/null +++ b/arch/arm/mach-versatile/kgdb_fiq.c @@ -0,0 +1,40 @@ +/* + * KGDB FIQ entry board/IC support + * + * Copyright 2012 Linaro Ltd. + * Anton Vorontsov + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 as published + * by the Free Software Foundation. + */ + +#include +#include +#include +#include +#include +#include +#include + +static int kgdb_fiq; +module_param_named(uart_num, kgdb_fiq, int, 0600); +MODULE_PARM_DESC(uart_num, "UART port to use for KGDB FIQ"); + +static bool is_kgdb_nmi(void) +{ + return vic_is_fiq_rised(kgdb_fiq); +} + +void kgdb_arch_enable_nmi(bool on) +{ + vic_fiq_select(kgdb_fiq, on); +} + +static int kgdb_fiq_init(void) +{ + kgdb_fiq += INT_UARTINT0; + kgdb_register_nmi(is_kgdb_nmi); + return 0; +} +console_initcall(kgdb_fiq_init);