From patchwork Thu Oct 13 12:31:20 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Nie X-Patchwork-Id: 9374925 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B2F3360839 for ; Thu, 13 Oct 2016 12:33:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A52EF2A028 for ; Thu, 13 Oct 2016 12:33:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 99FD32A02A; Thu, 13 Oct 2016 12:33:43 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 72D6A2A029 for ; Thu, 13 Oct 2016 12:33:41 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1bufBR-0005R4-Nn; Thu, 13 Oct 2016 12:32:25 +0000 Received: from mail-pa0-x231.google.com ([2607:f8b0:400e:c03::231]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bufB5-0005Hu-K3 for linux-arm-kernel@lists.infradead.org; Thu, 13 Oct 2016 12:32:07 +0000 Received: by mail-pa0-x231.google.com with SMTP id qn10so38228436pac.2 for ; Thu, 13 Oct 2016 05:31:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=TXknl4dzUVYcFbBVyu+/G4Ea5QvlCntDLi0lbWT1Gpo=; b=GfyjMH68iooFG603OIchbx8VZw0yKcwwJrEmCPcCRhD9iTI+TaOnW0JESC2UjA1Krw uWyBw58wVVBZupjt0qX7oBhJ5th779oIsibJeRtcAtCpBumzT2lqJ6meeTRFC4rsgnKV JCes8b/M6zWTKFRIrav6ShBPzvk1jEEXwEiGg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=TXknl4dzUVYcFbBVyu+/G4Ea5QvlCntDLi0lbWT1Gpo=; b=lvX1NzhkPkND8/74oib56wu13dV0EBt9nALcLXv+75Fva4pKi1vnCKb/N6EAsUn6nP jftUKXI4yjrqcBB0JiFXtPL3mBKzuW27G+PHSL92GoLIuFffwkirnCCxXEcSyMtRYPJU e47RGWFJLTv+0lOwd2npEtDwhauNjb9ydS5Tsl/efr7PCQcUAZBrBl++L9p+EgtnxVdE r7160s1ClC+gWYYPCgFg6kZUHCvQ3dA+XmOoe058H22C/1FqDXo6xoqQOSbsxoSW5RYS ghktZpJ8Xps3mnc5tenGMwyzuQcb0u6gzxKUPh1Dih+Ptt0a7ZTQzXySaVQHK+KzRSoX FiwQ== X-Gm-Message-State: AA6/9RkqC8yiCikhAuU49QL28+Q8YEdV42gB7kgwux02wbv6mvdy0sMA7g2118HL9j9FSuhT X-Received: by 10.66.86.37 with SMTP id m5mr936364paz.60.1476361902703; Thu, 13 Oct 2016 05:31:42 -0700 (PDT) Received: from localhost.localdomain ([113.29.230.82]) by smtp.gmail.com with ESMTPSA id fi6sm19522777pac.20.2016.10.13.05.31.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 13 Oct 2016 05:31:42 -0700 (PDT) From: Jun Nie To: arnd@arndb.de, arm@kernel.org, linux-arm-kernel@lists.infradead.org, shawn.guo@linaro.org Subject: [PATCH v2 1/2] arm64: dts: zx: Fix gic GICR property Date: Thu, 13 Oct 2016 20:31:20 +0800 Message-Id: <1476361881-19685-2-git-send-email-jun.nie@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1476361881-19685-1-git-send-email-jun.nie@linaro.org> References: <1476361881-19685-1-git-send-email-jun.nie@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20161013_053203_758351_F122ABB7 X-CRM114-Status: GOOD ( 11.87 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mark.rutland@arm.com, jason.liu@linaro.org, Jun Nie MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP GICR for multiple CPU can be described with start address and stride, or with multiple address. Current multiple address and stride are both used. Fix it. vmalloc patch 727a7f5a9 triggered this bug: [ 0.097146] Unable to handle kernel paging request at virtual address ffff000008060008 [ 0.097150] pgd = ffff000008602000 [ 0.097160] [ffff000008060008] *pgd=000000007fffe003, *pud=000000007fffd003, *pmd=000000007fffc003, *pte=0000000000000000 [ 0.097165] Internal error: Oops: 96000007 [#1] PREEMPT SMP [ 0.097170] Modules linked in: [ 0.097177] CPU: 1 PID: 0 Comm: swapper/1 Not tainted 4.8.0+ #1474 [ 0.097179] Hardware name: ZTE zx296718 evaluation board (DT) [ 0.097183] task: ffff80003e8c8b80 task.stack: ffff80003e8d0000 [ 0.097197] PC is at gic_populate_rdist+0x74/0x15c [ 0.097202] LR is at gic_starting_cpu+0xc/0x20 [ 0.097206] pc : [] lr : [] pstate: 600001c5 Signed-off-by: Jun Nie --- arch/arm64/boot/dts/zte/zx296718.dtsi | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/arch/arm64/boot/dts/zte/zx296718.dtsi b/arch/arm64/boot/dts/zte/zx296718.dtsi index a223066..6b239a3 100644 --- a/arch/arm64/boot/dts/zte/zx296718.dtsi +++ b/arch/arm64/boot/dts/zte/zx296718.dtsi @@ -239,16 +239,11 @@ compatible = "arm,gic-v3"; #interrupt-cells = <3>; #address-cells = <0>; - #redistributor-regions = <6>; - redistributor-stride = <0x0 0x40000>; + #redistributor-regions = <1>; + redistributor-stride = <0x20000>; interrupt-controller; reg = <0x02a00000 0x10000>, - <0x02b00000 0x20000>, - <0x02b20000 0x20000>, - <0x02b40000 0x20000>, - <0x02b60000 0x20000>, - <0x02b80000 0x20000>, - <0x02ba0000 0x20000>; + <0x02b00000 0xc0000>; interrupts = ; };