From patchwork Mon Dec 10 13:56:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 10721309 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 55F5F6C5 for ; Mon, 10 Dec 2018 13:57:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 488002A461 for ; Mon, 10 Dec 2018 13:57:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3C1852A7B2; Mon, 10 Dec 2018 13:57:00 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B82602A461 for ; Mon, 10 Dec 2018 13:56:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727540AbeLJN4l (ORCPT ); Mon, 10 Dec 2018 08:56:41 -0500 Received: from mail-wm1-f68.google.com ([209.85.128.68]:50372 "EHLO mail-wm1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727065AbeLJN4j (ORCPT ); Mon, 10 Dec 2018 08:56:39 -0500 Received: by mail-wm1-f68.google.com with SMTP id n190so11081649wmd.0 for ; Mon, 10 Dec 2018 05:56:38 -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=XZ8fgTNKEzlulFo0jglvRy93ay062mbv4LQ6PKEe/gQ=; b=Ifh4qIIogkIlOT5ZnX1slKO4f03/6yQT9zBvBopvAkosWoAwy3WBFU9MSAtQ6THa/p hL6vDcQsuDjkHyhy0QsSAbZeKmOKoB40v+tO/rMT5PiTYHT2N3JFBiNiteudDC70ASIP GRg6lyDod3DRMB4m6tPWOsgfCJrHvUKluEQGs= 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=XZ8fgTNKEzlulFo0jglvRy93ay062mbv4LQ6PKEe/gQ=; b=O0TZHqcUAHfYGzB4vB/NOEVlxn2tffS5opQPerAKrg4eF7AoBrlw/2eE3MbMsj6W2A 77pOJPasVIPtqeva5FO/BN25AvkG5+Vne6fXghj8qX3YOCWVcbhO8WMefgJPEMJSTcLr 0UFZCAEujTY8/4g4vl2ZzIplK33wqa6FhJBmqqQbfqnq4sfsIH3X1Wizdt1OvIGynrcp qx3Jdl3gDxyg24ftQmybc32erp6dPvKt8QzKjwHGagce8i3uxlBSYQQJv6OLOjit7Kgo YV5RyKEMVkdDtwuDnmqabVr4KRAFV2jKyGt9YXPGshXB6wGgS1zwI1h8nwOpiQPdeuCV 3MDQ== X-Gm-Message-State: AA+aEWZiScs17NQnzpnrlu7/Fx8aR2My17WdIazY3drDtm9usPKwcDb2 5N+k5y5lUSPjCbt/gtge8hJWMg== X-Google-Smtp-Source: AFSGD/U7Kcu70sbKMqXjj48JO5tvS6LST0JMd4ghPglM1XYQBeYb7USk0thl8srRmlHADDC3AQIrCw== X-Received: by 2002:a1c:4046:: with SMTP id n67mr10116856wma.123.1544450198145; Mon, 10 Dec 2018 05:56:38 -0800 (PST) Received: from srini-hackbox.lan (cpc89974-aztw32-2-0-cust43.18-1.cable.virginm.net. [86.30.250.44]) by smtp.gmail.com with ESMTPSA id c14sm8612506wme.13.2018.12.10.05.56.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 10 Dec 2018 05:56:37 -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, bjorn.andersson@linaro.org, nicolas.dechesne@linaro.org, ctatlor97@gmail.com, vkoul@kernel.org, robh+dt@kernel.org, devicetree@vger.kernel.org, Srinivas Kandagatla Subject: [PATCH v5 1/4] dt-bindings/gic-v3: Add msm8996 compatible string Date: Mon, 10 Dec 2018 13:56:30 +0000 Message-Id: <20181210135633.30283-2-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181210135633.30283-1-srinivas.kandagatla@linaro.org> References: <20181210135633.30283-1-srinivas.kandagatla@linaro.org> MIME-Version: 1.0 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Access to GICR_WAKER is restricted on msm8996 SoC in Hypervisor. There are many devices out there with this restriction in place and there has been no update to this firmware since last few years, making those devices totally unusable for upstream development. IIDR register value conflicts with other SoCs, using compatible seems to be the only way to apply quirks required for msm8996 based SoCs. Without this quirk many qcom SoCs (atleast 3 that I know) are unable to boot mainline. Signed-off-by: Srinivas Kandagatla Reviewed-by: Rob Herring --- .../devicetree/bindings/interrupt-controller/arm,gic-v3.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/interrupt-controller/arm,gic-v3.txt b/Documentation/devicetree/bindings/interrupt-controller/arm,gic-v3.txt index 3ea78c4ef887..b83bb8249074 100644 --- a/Documentation/devicetree/bindings/interrupt-controller/arm,gic-v3.txt +++ b/Documentation/devicetree/bindings/interrupt-controller/arm,gic-v3.txt @@ -7,7 +7,9 @@ Interrupts (LPI). Main node required properties: -- compatible : should at least contain "arm,gic-v3". +- compatible : should at least contain "arm,gic-v3" or either + "qcom,msm8996-gic-v3", "arm,gic-v3" for msm8996 SoCs + to address SoC specific bugs/quirks - interrupt-controller : Identifies the node as an interrupt controller - #interrupt-cells : Specifies the number of cells needed to encode an interrupt source. Must be a single cell with a value of at least 3. From patchwork Mon Dec 10 13:56:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 10721311 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 139D01751 for ; Mon, 10 Dec 2018 13:57:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0701B2A7C0 for ; Mon, 10 Dec 2018 13:57:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EF8C62A7CC; Mon, 10 Dec 2018 13:57:06 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 867DE2A7C3 for ; Mon, 10 Dec 2018 13:57:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727583AbeLJN47 (ORCPT ); Mon, 10 Dec 2018 08:56:59 -0500 Received: from mail-wm1-f66.google.com ([209.85.128.66]:51418 "EHLO mail-wm1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727579AbeLJN4l (ORCPT ); Mon, 10 Dec 2018 08:56:41 -0500 Received: by mail-wm1-f66.google.com with SMTP id s14so11057689wmh.1 for ; Mon, 10 Dec 2018 05:56:40 -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=aP1EI+I5RgUtlWmE62M6UqtQRQysaLb2DRE3LkFnZds=; b=B09g4Xy82FcFY6jgXrd63y5ie+XkYuOwdxpt0/5QZadsPOp8zF+TIejqW9g4Fq11IV SbJgQic/R6nq0OCQCFH3w2poa+aYVltPDPvkGLQknZv1UY+pZ2SpMN1gbFpo4ZRJcsC9 HlP5jVVDKVTv54kxY6rWkPY8wk/Xa2JWkeRqM= 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=aP1EI+I5RgUtlWmE62M6UqtQRQysaLb2DRE3LkFnZds=; b=aUNQ0XZrv5+JeCxiakO3ioN4lU26zAcZQEWj5B9VbgdRAFmR6AeS+uuS/QFZOdU2Ns w6CQPCs9iD1+LTTIDv29fNpSM4KRTLpJ3QCT1V38t3zjZxvRcZvK2kbdckwPgaJodfg/ BKx15WBwOSpKO/qOgbccDKwzxEodBdGoqc3FCxDo94s40wWg65+d60758hx2y/DgIyDj EehGiGruVlycc8QkubuIk2/MGIIHh8aOBJHYXxiCaXtRGsPzdjgqoG0KqCzAi/FP7DQo Zdp11AAnq05ZJ5UjM7/MmAkIIKEzvdHHgV1q+j7HDlH5Pm3fWfF2sRqqWN9LiELGoWF8 J2WA== X-Gm-Message-State: AA+aEWYzTjUltvFTuYJk0Wa5BR1U9/Ri5af5PAXEyGRusCOis/oN8/oy HNsRk9LbJ2XoqiY1YMadBV+KSg== X-Google-Smtp-Source: AFSGD/WZBTBG1icveDhH8Y+l96Jh9BetzrqoXCGYGD8yAS9xngGZlcsfWU9Rgs8P7Dh9hlgNDmUR2w== X-Received: by 2002:a1c:8302:: with SMTP id f2mr11351091wmd.9.1544450199431; Mon, 10 Dec 2018 05:56:39 -0800 (PST) Received: from srini-hackbox.lan (cpc89974-aztw32-2-0-cust43.18-1.cable.virginm.net. [86.30.250.44]) by smtp.gmail.com with ESMTPSA id c14sm8612506wme.13.2018.12.10.05.56.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 10 Dec 2018 05:56:38 -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, bjorn.andersson@linaro.org, nicolas.dechesne@linaro.org, ctatlor97@gmail.com, vkoul@kernel.org, robh+dt@kernel.org, devicetree@vger.kernel.org, Srinivas Kandagatla Subject: [PATCH v5 2/4] irqchip/gic: common: add support to device tree based quirks Date: Mon, 10 Dec 2018 13:56:31 +0000 Message-Id: <20181210135633.30283-3-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181210135633.30283-1-srinivas.kandagatla@linaro.org> References: <20181210135633.30283-1-srinivas.kandagatla@linaro.org> MIME-Version: 1.0 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch adds support to device tree based quirks based on device tree compatible string. Signed-off-by: Srinivas Kandagatla --- drivers/irqchip/irq-gic-common.c | 12 ++++++++++++ drivers/irqchip/irq-gic-common.h | 3 +++ drivers/irqchip/irq-gic-v3.c | 7 +++++++ 3 files changed, 22 insertions(+) diff --git a/drivers/irqchip/irq-gic-common.c b/drivers/irqchip/irq-gic-common.c index 01e673c680cd..3c93c6f4d1f1 100644 --- a/drivers/irqchip/irq-gic-common.c +++ b/drivers/irqchip/irq-gic-common.c @@ -36,6 +36,18 @@ void gic_set_kvm_info(const struct gic_kvm_info *info) gic_kvm_info = info; } +void gic_enable_of_quirks(const struct device_node *np, + const struct gic_quirk *quirks, void *data) +{ + for (; quirks->desc; quirks++) { + if (!of_device_is_compatible(np, quirks->compatible)) + continue; + if (quirks->init(data)) + pr_info("GIC: enabling workaround for %s\n", + quirks->desc); + } +} + void gic_enable_quirks(u32 iidr, const struct gic_quirk *quirks, void *data) { diff --git a/drivers/irqchip/irq-gic-common.h b/drivers/irqchip/irq-gic-common.h index 3919cd7c5285..97e58fb6c232 100644 --- a/drivers/irqchip/irq-gic-common.h +++ b/drivers/irqchip/irq-gic-common.h @@ -23,6 +23,7 @@ struct gic_quirk { const char *desc; + const char *compatible; bool (*init)(void *data); u32 iidr; u32 mask; @@ -35,6 +36,8 @@ void gic_dist_config(void __iomem *base, int gic_irqs, void gic_cpu_config(void __iomem *base, void (*sync_access)(void)); void gic_enable_quirks(u32 iidr, const struct gic_quirk *quirks, void *data); +void gic_enable_of_quirks(const struct device_node *np, + const struct gic_quirk *quirks, void *data); void gic_set_kvm_info(const struct gic_kvm_info *info); diff --git a/drivers/irqchip/irq-gic-v3.c b/drivers/irqchip/irq-gic-v3.c index 29e9d47be97d..df1ff3b5836a 100644 --- a/drivers/irqchip/irq-gic-v3.c +++ b/drivers/irqchip/irq-gic-v3.c @@ -1271,6 +1271,11 @@ static void __init gic_of_setup_kvm_info(struct device_node *node) gic_set_kvm_info(&gic_v3_kvm_info); } +static const struct gic_quirk gic_quirks[] = { + { + } +}; + static int __init gic_of_init(struct device_node *node, struct device_node *parent) { void __iomem *dist_base; @@ -1318,6 +1323,8 @@ static int __init gic_of_init(struct device_node *node, struct device_node *pare if (of_property_read_u64(node, "redistributor-stride", &redist_stride)) redist_stride = 0; + gic_enable_of_quirks(node, gic_quirks, &gic_data); + err = gic_init_bases(dist_base, rdist_regs, nr_redist_regions, redist_stride, &node->fwnode); if (err) From patchwork Mon Dec 10 13:56:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 10721305 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 91F1F1751 for ; Mon, 10 Dec 2018 13:56:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7F6032A461 for ; Mon, 10 Dec 2018 13:56:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7376A2A7AE; Mon, 10 Dec 2018 13:56:48 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 59FD32A461 for ; Mon, 10 Dec 2018 13:56:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727642AbeLJN4n (ORCPT ); Mon, 10 Dec 2018 08:56:43 -0500 Received: from mail-wm1-f67.google.com ([209.85.128.67]:50379 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727583AbeLJN4m (ORCPT ); Mon, 10 Dec 2018 08:56:42 -0500 Received: by mail-wm1-f67.google.com with SMTP id n190so11081830wmd.0 for ; Mon, 10 Dec 2018 05:56:41 -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=pcqzNhK37A8PsauAg3JtU8lMxDR18aEHWGkU2JQ1rE0=; b=FEyYX0GKa7zyo+R0sR4Al5ZZHyAtV+pGZEqp4CiUepxHiYZqEBsXFlR1TYmcTrnVZw 8lg8RNseo7ueCBO4fPikaa03osiOzSFs5JvQb0VtPRQMTi9lN+AOYlegr2jN2MjgGgP9 XdtDj+BwrdDcwXtJJ/rVJDO5fAweLc3T5NdWk= 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=pcqzNhK37A8PsauAg3JtU8lMxDR18aEHWGkU2JQ1rE0=; b=YyA3GDHYXpWdy4FqOZdvnMD6LE5AF8vGoEz0IQYoVOSg/x3yoOQHIDY17aHhBstv86 UV7U7EKWsWqS24Qszy+/o280l4HhPpi64mou0b+N1bnfp6UPqnxf/IzLgHH3VZn4/r05 8ko8zOO78cmxkjcIdXnFkfClQ810J4M/4qjvNZGCtOjdDsJajI+tz6xsG6+NA6LU11y6 gzYobHnSiB4wTj0BXr7rHx0It1UUk7TqwyIH0JOSUl3DsPc2L2NiQwoErmGPWwfLc5fT wgFOO5vmElyJcLB4gOZ1pzk7NcyUOqPj9QLaKo2T78rcrWecL8Ogz6ZXNfKH47ReZ8qP 5n4w== X-Gm-Message-State: AA+aEWa9263IPZoBJs0pSvVp3sDx2XMvvoCZcOZgKl9145bErh61cymh CVOt/KIutoddfl2pRu9bTYDvOg== X-Google-Smtp-Source: AFSGD/UAhoaUzrzABSkxsTQP8wDF89XRQSNUqiPAohZeQqVxSzPc0C9g1axSaOG4i5JBd/XmiyJVtg== X-Received: by 2002:a1c:d14d:: with SMTP id i74mr10129357wmg.100.1544450200855; Mon, 10 Dec 2018 05:56:40 -0800 (PST) Received: from srini-hackbox.lan (cpc89974-aztw32-2-0-cust43.18-1.cable.virginm.net. [86.30.250.44]) by smtp.gmail.com with ESMTPSA id c14sm8612506wme.13.2018.12.10.05.56.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 10 Dec 2018 05:56:40 -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, bjorn.andersson@linaro.org, nicolas.dechesne@linaro.org, ctatlor97@gmail.com, vkoul@kernel.org, robh+dt@kernel.org, devicetree@vger.kernel.org, Srinivas Kandagatla Subject: [PATCH v5 3/4] irqchip: gic-v3: Add quirk for msm8996 secured registers Date: Mon, 10 Dec 2018 13:56:32 +0000 Message-Id: <20181210135633.30283-4-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181210135633.30283-1-srinivas.kandagatla@linaro.org> References: <20181210135633.30283-1-srinivas.kandagatla@linaro.org> MIME-Version: 1.0 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 Qualcomm 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 | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/drivers/irqchip/irq-gic-v3.c b/drivers/irqchip/irq-gic-v3.c index df1ff3b5836a..0868a9d81c3c 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,15 @@ static const struct irq_domain_ops partition_domain_ops = { .select = gic_irq_domain_select, }; +static bool gic_enable_quirk_msm8996(void *data) +{ + struct gic_chip_data *d = data; + + d->flags |= FLAGS_WORKAROUND_GICR_WAKER_MSM8996; + + return true; +} + static int __init gic_init_bases(void __iomem *dist_base, struct redist_region *rdist_regs, u32 nr_redist_regions, @@ -1272,6 +1287,11 @@ static void __init gic_of_setup_kvm_info(struct device_node *node) } static const struct gic_quirk gic_quirks[] = { + { + .desc = "GICv3: Qualcomm MSM8996 broken firmware", + .compatible = "qcom,msm8996-gic-v3", + .init = gic_enable_quirk_msm8996, + }, { } }; From patchwork Mon Dec 10 13:56:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 10721307 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9C2C36C5 for ; Mon, 10 Dec 2018 13:56:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8EA1C2A798 for ; Mon, 10 Dec 2018 13:56:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 830EB2A79D; Mon, 10 Dec 2018 13:56:49 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7AD332A79C for ; Mon, 10 Dec 2018 13:56:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727656AbeLJN4o (ORCPT ); Mon, 10 Dec 2018 08:56:44 -0500 Received: from mail-wm1-f67.google.com ([209.85.128.67]:52532 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727633AbeLJN4n (ORCPT ); Mon, 10 Dec 2018 08:56:43 -0500 Received: by mail-wm1-f67.google.com with SMTP id r11-v6so10968087wmb.2 for ; Mon, 10 Dec 2018 05:56:42 -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=G2KRU/g/GisxnlaqWW4HcsfIO+AdwGpDB+M+SNsZ+gc=; b=DgCCOpV1jjqexVZrzVy5+Gm6pzIHO/uvplxk09R+5QQCC1YF8Szo5o39EDrQ53PvpZ 7O8EZ+zKW707HF86QTKia0ZuocvPLTm+4CeQJeGQ2QuNNfHzsGttiq3b3BLJNtlY2YW9 Dkx0MFPsiEkppVdkE1XbHm/Eqc4ePHjlhrNc4= 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=G2KRU/g/GisxnlaqWW4HcsfIO+AdwGpDB+M+SNsZ+gc=; b=L+03eBaA93CgUDoR0Mn+QWa2fLrsVrru+st3bF9Ev3wQUtKZBtPf1A4d5vumATA5Bu INuLinaE1W+r5hil4AJYqtn+o+t/oVs9H0wv+nU0P6P9DCc7yIUmqEv7dhDt2xaj/1fu tSuqRU+pWtOhC+semE3okLk09DME8naaHvd59kXe3cWZb/1wD9ZhzSeTaf+RXYOtZ8hT BTAsex+RWD1ksXpGfk7E2FDOOzjTh9EGPmmmJMOY3bmvIBCf9to6gnnEmfwAO1RSbtqW nRfYAFcHDgz+NqthBwUOQR69k5eFVLgxbEIWSiAupMvUC36+31dvgcZ42dP2bjffLJaZ o4hw== X-Gm-Message-State: AA+aEWZKI+1hDcoMo36MTD1oVAYsg0NDqRklJF3F0ioxMvxagqe+eOAZ Ux0ptiIogXJDzMHWWaHe8Otenw== X-Google-Smtp-Source: AFSGD/W2WwDPHKKlo3VBdUyi3rLn0TU5/UAfjIUC84ZwSp+v6svxqoKaW1CDKkVjGH/qLifqbtW1KQ== X-Received: by 2002:a1c:5585:: with SMTP id j127-v6mr9954369wmb.127.1544450202086; Mon, 10 Dec 2018 05:56:42 -0800 (PST) Received: from srini-hackbox.lan (cpc89974-aztw32-2-0-cust43.18-1.cable.virginm.net. [86.30.250.44]) by smtp.gmail.com with ESMTPSA id c14sm8612506wme.13.2018.12.10.05.56.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 10 Dec 2018 05:56:41 -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, bjorn.andersson@linaro.org, nicolas.dechesne@linaro.org, ctatlor97@gmail.com, vkoul@kernel.org, robh+dt@kernel.org, devicetree@vger.kernel.org, Srinivas Kandagatla Subject: [PATCH v5 4/4] arm64: dts: add msm8996 compatible to gicv3 Date: Mon, 10 Dec 2018 13:56:33 +0000 Message-Id: <20181210135633.30283-5-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181210135633.30283-1-srinivas.kandagatla@linaro.org> References: <20181210135633.30283-1-srinivas.kandagatla@linaro.org> MIME-Version: 1.0 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add compatible to gicv3 node to enable quirk required to restrict writing to GICR_WAKER register which is restricted on msm8996 SoC in Hypervisor. With this quirk MSM8996 can at least boot out of mainline, which can help community to work with boards based on MSM8996. Without this patch Qualcomm DB820c board reboots on mainline. Signed-off-by: Srinivas Kandagatla --- arch/arm64/boot/dts/qcom/msm8996.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi index 8585c61e32ef..cd9650cea05d 100644 --- a/arch/arm64/boot/dts/qcom/msm8996.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi @@ -404,7 +404,7 @@ }; intc: interrupt-controller@9bc0000 { - compatible = "arm,gic-v3"; + compatible = "qcom,msm8996-gic-v3", "arm,gic-v3"; #interrupt-cells = <3>; interrupt-controller; #redistributor-regions = <1>;