From patchwork Mon Nov 12 10:33:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 150816 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp2980731ljp; Mon, 12 Nov 2018 02:37:06 -0800 (PST) X-Google-Smtp-Source: AJdET5ep0+X3JuTClmM0ZfuDRrqUkvoeUXPXemBl/j36sUOHsbiihKZ1XBtJ3shC31tHbP3DChy+ X-Received: by 2002:a17:902:50ec:: with SMTP id c41-v6mr409981plj.176.1542019026700; Mon, 12 Nov 2018 02:37:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542019026; cv=none; d=google.com; s=arc-20160816; b=HD1+ihcXFveu2xXeMReoLL7HawJ1j11IPeQsPIRsE5BEomd+6QhU/wb6bnQxlkT41p 0hhPWZfa7WI3chzhiA7xHlBDtvXgHLJgUiNyf4x976wvzU+1V11JWbRbOhCndlAukLwE lWLF8O+IncbBn2Br+2Z+LC2OcxFr8RbXgz9acFcc5ZAaz074MMJqSQIUQg3qJ/udU2sS NeV4o7kjdDbcmW1Dgx4Pb61KQTtJTg4fpSKVw8BNuQssn3NyizzyXUiCpw3Mww49mO4X 07HzQB+DugWPnjHO8meHaop0/AgCkXWArm8urzD0I3Vx9z4mVOOKP2dlUO978r7wy8hc bMsg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=dSzyRYCj+DB3PSpFskdzVkVAIM/Xjweh2bjnaCEiMfA=; b=PPrw9vQ3SerZ2YSBFGT5IQRcrAPbz7ohrrP4uGoYUdEzeI/7cG2ug5Zsx+JchZN2FY AuDlKQg4ij2c+rxdOX9i/RlbQqmJ7aCktCyfLgpEUFOo08YMb+HAzMRRf3N8qp9OEnwG d18M1qBo06v+2APx1Gl3MGB0RRFTPW6fHWbAxJ7eKxBkApu5pOSXZm6hfUCv5lBGJf1a d/uyOAPA9TMNwH1ZyhjAfWkEbXWzeh+KBn1rWWifAQYlQX7KCqYmDatHtyHIRLWiPU4l uwlXh5u57jQO1JsmXakh/PWwuLmIVshBcKbh2A1SpNvqcrwK3TSGgD/PAvQLO4eQSTsj Q/yQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=XhlEwHfg; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id k83-v6si18221050pfj.115.2018.11.12.02.37.06; Mon, 12 Nov 2018 02:37:06 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=XhlEwHfg; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729465AbeKLU3l (ORCPT + 32 others); Mon, 12 Nov 2018 15:29:41 -0500 Received: from mail-wr1-f68.google.com ([209.85.221.68]:46410 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729409AbeKLU3k (ORCPT ); Mon, 12 Nov 2018 15:29:40 -0500 Received: by mail-wr1-f68.google.com with SMTP id 74-v6so8704957wrb.13 for ; Mon, 12 Nov 2018 02:37:01 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=dSzyRYCj+DB3PSpFskdzVkVAIM/Xjweh2bjnaCEiMfA=; b=XhlEwHfg3LEQdDgBsTAmCd705FSzwvTzZdEZ5wEnOU8ssVJqg5FlJn1ZIADgseYXLz KWflbNRYE7srjfF2oyiURxKYqTwBETX/cwfAebAtbsKLezI3YUqtAFJ4D3TQCtNQB1VO vmYbmbhlDutGw0BIiqSJENHGJpaaniZssIEdg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=dSzyRYCj+DB3PSpFskdzVkVAIM/Xjweh2bjnaCEiMfA=; b=FnqYpCHRseLpvGUUYdzRD+oZ5PWClI313HeLETUeTgfyy4THS3yNTgHd41EE27qh2L Yr9B4U9XocTueiGOqYejurSVRvruOgjCPX5AEfOnHEMSZC89IWVtCPEG0siIyFLhCvJf FHc8PiEtvWo8BrZIxpAu7uu1R9V0/TTz0TZJkpSCUbuvF2shCSObxPOwaqaBqFVVFWpQ q5kRI5PxJvXVrmPTFIqvq7ww6mcRTYHZAn4leD+lXKST7NtVlY6TI1jSSzV2Ll676GHE cuyS58a1REZgktcmZHhYCmvZwXz81QikJFMtKNqM0T1e5HuLoifK+0DhcIXbAKMREccx y6ag== X-Gm-Message-State: AGRZ1gJ9AKnwCWrifBL7eTobQC5gZJRTU1MFcJw68r1OdTfBLmZq64i0 eVoXainRUyPeI5Jf24VOtAZyNg== X-Received: by 2002:adf:ebd2:: with SMTP id v18-v6mr440722wrn.109.1542019020776; Mon, 12 Nov 2018 02:37:00 -0800 (PST) Received: from localhost.localdomain (cpc90716-aztw32-2-0-cust92.18-1.cable.virginm.net. [86.26.100.93]) by smtp.gmail.com with ESMTPSA id z17-v6sm13747187wrm.65.2018.11.12.02.36.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 12 Nov 2018 02:37:00 -0800 (PST) From: Srinivas Kandagatla To: marc.zyngier@arm.com Cc: sudeep.holla@arm.com, tglx@linutronix.de, jason@lakedaemon.net, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, rnayak@codeaurora.org, sboyd@kernel.org, srini@kernel.org, bjorn.andersson@linaro.org, nicolas.dechesne@linaro.org, ctatlor97@gmail.com, vkoul@kernel.org, Srinivas Kandagatla Subject: [RFC PATCH v3 3/4] irqchip: gic-v3: Add quirk for msm8996 secured registers Date: Mon, 12 Nov 2018 10:33:39 +0000 Message-Id: <20181112103340.24702-4-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181112103340.24702-1-srinivas.kandagatla@linaro.org> References: <20181112103340.24702-1-srinivas.kandagatla@linaro.org> MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Access to GICR_WAKER is restricted on msm8996 SoC in Hypervisor. Its been more than 2+ years of wait for this to be fixed, which has no hopes to be fixed. This change was introduced for the "lead device" on msm8996 platform. It looks like all publicly available msm8996 and other qcom SoCs have this implementation. So add a quirk to not access this register on msm8996. With this quirk MSM8996 can at least boot out of mainline, which can help community to work with boards based on MSM8996 and other SoCs with have this restrictions. This Quirk is based on device tree compatible string. Without this patch Qualcomm DB820c board reboots when GICR_WAKER is accessed. Signed-off-by: Srinivas Kandagatla --- drivers/irqchip/irq-gic-v3.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) -- 2.19.1 diff --git a/drivers/irqchip/irq-gic-v3.c b/drivers/irqchip/irq-gic-v3.c index 8f87f40c9460..4bd3bbe1b7ce 100644 --- a/drivers/irqchip/irq-gic-v3.c +++ b/drivers/irqchip/irq-gic-v3.c @@ -41,6 +41,8 @@ #include "irq-gic-common.h" +#define FLAGS_WORKAROUND_GICR_WAKER_MSM8996 (1ULL << 0) + struct redist_region { void __iomem *redist_base; phys_addr_t phys_base; @@ -55,6 +57,7 @@ struct gic_chip_data { struct irq_domain *domain; u64 redist_stride; u32 nr_redist_regions; + u64 flags; bool has_rss; unsigned int irq_nr; struct partition_desc *ppi_descs[16]; @@ -139,6 +142,9 @@ static void gic_enable_redist(bool enable) u32 count = 1000000; /* 1s! */ u32 val; + if (gic_data.flags & FLAGS_WORKAROUND_GICR_WAKER_MSM8996) + return; + rbase = gic_data_rdist_rd_base(); val = readl_relaxed(rbase + GICR_WAKER); @@ -1067,6 +1073,23 @@ static const struct irq_domain_ops partition_domain_ops = { .select = gic_irq_domain_select, }; +static bool __maybe_unused gic_enable_quirk_msm8996(void *data) +{ + struct gic_chip_data *d = data; + + d->flags |= FLAGS_WORKAROUND_GICR_WAKER_MSM8996; + + return true; +} + +static const struct gic_quirk gic_quirks[] = { + { + .desc = "GICv3: Qualcomm MSM8996 skip GICR_WAKER Read/Write", + .compatible = "qcom,msm8996-gic-v3", /* MSM8996 */ + .init = gic_enable_quirk_msm8996, + }, +}; + static int __init gic_init_bases(void __iomem *dist_base, struct redist_region *rdist_regs, u32 nr_redist_regions, @@ -1126,6 +1149,9 @@ static int __init gic_init_bases(void __iomem *dist_base, gic_update_vlpi_properties(); + if (is_of_node(handle)) + gic_enable_of_quirks(to_of_node(handle), gic_quirks, &gic_data); + gic_smp_init(); gic_dist_init(); gic_cpu_init();