From patchwork Fri Jul 13 10:16:47 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Vorontsov X-Patchwork-Id: 9985 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 824BE23E1B for ; Fri, 13 Jul 2012 10:19:25 +0000 (UTC) Received: from mail-yx0-f180.google.com (mail-yx0-f180.google.com [209.85.213.180]) by fiordland.canonical.com (Postfix) with ESMTP id 523AEA18243 for ; Fri, 13 Jul 2012 10:19:25 +0000 (UTC) Received: by mail-yx0-f180.google.com with SMTP id q6so3667522yen.11 for ; Fri, 13 Jul 2012 03:19:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=gutamc/9C2YbfIWdRKmjb5P7APPQ/IPXGsnP6RLdlYc=; b=keatEHLWhkhXp50dAeAa6IroLAiRStx50Fu2uN6OXFTYvIvD77/rb37qJrohDH6bbZ 99YGf+hWJ8Vs66zLP/FfSKHeD6gvPK/0xWtA4JCHWjvOLYwVEyqkmMocnIctSxBRyYBL fwd8/u3OhK5LUcH/gPsGeXG8uRu2EUD+JSQ4Q8aF6cEin8vQSMsyKaVlmFv+fvaCZYqT UoQg2hDuoVxx14zFltw/dY1XtgKDC+sTpLYY+80ShcSu8Q7/fy774X9Yc8My1FIA5mxF N3HXlzJglbOJPQHrhEC4DY/q/bLlcyzy8q8n82skyIB2v5p7Po9F+F91BSstIbA9Ca2J gdfw== Received: by 10.50.203.39 with SMTP id kn7mr376428igc.53.1342174764923; Fri, 13 Jul 2012 03:19:24 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.231.241.2 with SMTP id lc2csp13702ibb; Fri, 13 Jul 2012 03:19:24 -0700 (PDT) Received: by 10.236.185.195 with SMTP id u43mr444776yhm.97.1342174764129; Fri, 13 Jul 2012 03:19:24 -0700 (PDT) Received: from mail-gh0-f178.google.com (mail-gh0-f178.google.com [209.85.160.178]) by mx.google.com with ESMTPS id s62si6728515yhm.103.2012.07.13.03.19.23 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 13 Jul 2012 03:19:24 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.160.178 is neither permitted nor denied by best guess record for domain of anton.vorontsov@linaro.org) client-ip=209.85.160.178; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.160.178 is neither permitted nor denied by best guess record for domain of anton.vorontsov@linaro.org) smtp.mail=anton.vorontsov@linaro.org Received: by mail-gh0-f178.google.com with SMTP id f1so3974522ghb.37 for ; Fri, 13 Jul 2012 03:19:23 -0700 (PDT) Received: by 10.66.84.230 with SMTP id c6mr1192971paz.18.1342174763475; Fri, 13 Jul 2012 03:19:23 -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 oy8sm5749778pbc.52.2012.07.13.03.19.22 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 13 Jul 2012 03:19:22 -0700 (PDT) From: Anton Vorontsov To: Russell King , Jason Wessel Cc: =?UTF-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= , Colin Cross , John Stultz , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linaro-kernel@lists.linaro.org, patches@linaro.org, kernel-team@android.com, kgdb-bugreport@lists.sourceforge.net Subject: [PATCH 7/8] ARM: versatile: Make able to use UART ports for KGDB FIQ debugger Date: Fri, 13 Jul 2012 03:16:47 -0700 Message-Id: <1342174608-22407-7-git-send-email-anton.vorontsov@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <20120713101605.GA16139@lizard> References: <20120713101605.GA16139@lizard> X-Gm-Message-State: ALoCoQmyn2R+GrBcT7u6MvwS0k0FwjRQGEVK6OWAJ8nxOQhDJ/s2hgoa4oI9GLaqBQgatVJ0BX+J 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/Kconfig | 1 + arch/arm/mach-versatile/Makefile | 1 + arch/arm/mach-versatile/include/mach/irqs.h | 1 + arch/arm/mach-versatile/kgdb_fiq.c | 31 +++++++++++++++++++++++++++ 4 files changed, 34 insertions(+) create mode 100644 arch/arm/mach-versatile/kgdb_fiq.c diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index ae6ddf1..c0df1ba 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -311,6 +311,7 @@ config ARCH_VERSATILE select ICST select GENERIC_CLOCKEVENTS select ARCH_WANT_OPTIONAL_GPIOLIB + select ARCH_MIGHT_HAVE_FIQ select NEED_MACH_IO_H if PCI select PLAT_VERSATILE select PLAT_VERSATILE_CLCD 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..3cdf71d --- /dev/null +++ b/arch/arm/mach-versatile/kgdb_fiq.c @@ -0,0 +1,31 @@ +/* + * KGDB FIQ board 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 + +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 int __init kgdb_fiq_init(void) +{ + WARN_ON(kgdb_fiq > INT_UARTINT2 - INT_UARTINT0); + + return kgdb_register_fiq(INT_UARTINT0 + kgdb_fiq, + vic_fiq_select, + vic_is_fiq_rised); +} +console_initcall(kgdb_fiq_init);