From patchwork Thu Oct 12 18:32:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 115662 Delivered-To: patch@linaro.org Received: by 10.80.163.170 with SMTP id s39csp2038602edb; Thu, 12 Oct 2017 11:33:05 -0700 (PDT) X-Received: by 10.84.198.131 with SMTP id p3mr940667pld.245.1507833185661; Thu, 12 Oct 2017 11:33:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507833185; cv=none; d=google.com; s=arc-20160816; b=jsPXmR4rfEQu21s4WMBufYTBYCPbAb5R0m6oKCv5dO8mzhbkwYGrixToMjcCdhbbz1 GpJEcvRm12Za/l/qZiz8kcYIfLA898tP2IalnfZuCv0ZTAvg0BImoq9gPbAuxKUV3hfn JeTDC/bKSLaCCNFUdL4+2KJMTMTJ1VunfPBVgAWvIGi0hC5sBUpvgRzqnTutAAiG+Y9e o5dsmceTmLMTDFoGJdF4AiN3YTX1pDOAhlLKte9xKTG+laSkymMTlFLvOE52Br/G1Acg zMXZ9AWkVcdCI9sqo3hyAZaAAfi4anM0Y9HRi/yEq1oQkBB7pUOCYDFPG2NsHDMTcpHk rBCg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=EQu7PFLjrq2GiEHpKuuMmsW9JiqjM6AT0EmeueAqLhg=; b=Jab34k2xiPgjqP6MuegXDqFLlN6KqtENsvJcw1bT88USxeuBWQlKiPKnPrh8w1QgkN h8euaOieRabV+AtJsXVSo94XxYrE5tsEHuUbG5+ASmyLFaUpMuAaO8BJRCDJfyyR0haX IZ3a7p9V5qoxDUNrt7n6MZZNKkWHK/ql6qxxHJdr0NUOS4WPQ3M3vlIdkC/flFGMz8Uq /dq4Y34ERQM7CP5A0aLEd+0bJ83KIyqHcNdJoQ5DKtXVW/hEOBl5jA1Bxnpqeb6OslwS c5kHHUNy0NYFaZONb47fZLexSoX2iMAvhMSDP3BIbc1Q8yZo7DsK1m3Bx2nGr2J31WUE U/qg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=MuzbCkd0; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=fail (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 s19si8807466pfj.225.2017.10.12.11.33.05; Thu, 12 Oct 2017 11:33:05 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=MuzbCkd0; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755596AbdJLSdD (ORCPT + 6 others); Thu, 12 Oct 2017 14:33:03 -0400 Received: from mail-wm0-f49.google.com ([74.125.82.49]:50770 "EHLO mail-wm0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754188AbdJLSdB (ORCPT ); Thu, 12 Oct 2017 14:33:01 -0400 Received: by mail-wm0-f49.google.com with SMTP id u138so15508250wmu.5 for ; Thu, 12 Oct 2017 11:33:01 -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=hcoqsPVs5C7Pd8/M04kFqx7qMm95VJSP1qF5aCHerpw=; b=MuzbCkd0xouTYTrTVeB6IVJw6kgUt/msBbuFqqbNeDflK4p7poMSWRLxcwDekTnK2H NHkMT5bDXibAB3e1QZchG/fmOb4sqZgbtZ6mvpaG+Le9djngnUrzaxvM4o1e6qwBjrH8 9rwylh/Pb2Atmkt32w+zquJJzQCs++TtISf+Q= 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; bh=hcoqsPVs5C7Pd8/M04kFqx7qMm95VJSP1qF5aCHerpw=; b=rt4JKUxurOHd8Kl1jIDda5i2sjwQlbrIYaS5it0ALNmQmEyAirjFBrdkSmrcwM6fj4 i0QbyayxNTx/eg4GMWyRoHyeKJ6/Hh3OQJQTrzgGtB3YC9dDHmp4RWtEf6NGFpaWFWC5 khasZ9rW7LPo3DSTuLDXAfTOwKj3Q6YiD56lYZDX46nPiJ2K6GJMN0EQJobK9orhXRAC mt9fXbPWHGlMO6wIsUo+tuZ7TUR8U8nHsSlLtdUI8mDe9Cgth97+hPINMa3e+oNcZkvq PlnVESdqK2srbV3cT7zYK8vkeP6EgYwzHoeBbOVHhH4EOn02xgr7+v1uIekY+L4f5mz6 +arA== X-Gm-Message-State: AMCzsaXyYPC9TsQzU/i5yxNldhzcFnaElgfm5hSEujjVt28CH7ccjX/n gQC50FMeLWtYA1hd6mV3eC5Lhw== X-Google-Smtp-Source: AOwi7QDoV7GMTB4RxK8tVR88EAfbmu/P3G/1iR8Yx6rgQhr3DgJpwpkrkAEHgqTX0RHN5Kim1RUiBw== X-Received: by 10.223.139.145 with SMTP id o17mr2710951wra.107.1507833180703; Thu, 12 Oct 2017 11:33:00 -0700 (PDT) Received: from localhost.localdomain ([196.78.24.219]) by smtp.gmail.com with ESMTPSA id i13sm14730579wre.93.2017.10.12.11.32.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Oct 2017 11:33:00 -0700 (PDT) From: Ard Biesheuvel To: marc.zyngier@arm.com, robin.murphy@arm.com Cc: linux-arm-kernel@lists.infradead.org, daniel.thompson@Linaro.org, leif.lindholm@linaro.org, graeme.gregory@linaro.org, catalin.marinas@arm.com, will.deacon@arm.com, devicetree@vger.kernel.org, robh+dt@kernel.org, Ard Biesheuvel Subject: [PATCH v3 1/2] drivers/irqchip: gicv3: probe device ID space before quirks handling Date: Thu, 12 Oct 2017 19:32:46 +0100 Message-Id: <20171012183247.23679-2-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171012183247.23679-1-ard.biesheuvel@linaro.org> References: <20171012183247.23679-1-ard.biesheuvel@linaro.org> Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Before adding another SoC whose device ID space deviates from the value presented in the GIC ID registers, let's slightly refactor the code so that the ID registers are probed before that quirks handling executes. This allows us to move the device ID override into the quirk handler itself. Signed-off-by: Ard Biesheuvel --- drivers/irqchip/irq-gic-v3-its.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) -- 2.11.0 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/irqchip/irq-gic-v3-its.c b/drivers/irqchip/irq-gic-v3-its.c index e8d89343d613..891de07fd4cc 100644 --- a/drivers/irqchip/irq-gic-v3-its.c +++ b/drivers/irqchip/irq-gic-v3-its.c @@ -1650,23 +1650,14 @@ static void its_free_tables(struct its_node *its) static int its_alloc_tables(struct its_node *its) { - u64 typer = gic_read_typer(its->base + GITS_TYPER); - u32 ids = GITS_TYPER_DEVBITS(typer); u64 shr = GITS_BASER_InnerShareable; u64 cache = GITS_BASER_RaWaWb; u32 psz = SZ_64K; int err, i; - if (its->flags & ITS_FLAGS_WORKAROUND_CAVIUM_22375) { - /* - * erratum 22375: only alloc 8MB table size - * erratum 24313: ignore memory access type - */ - cache = GITS_BASER_nCnB; - ids = 0x14; /* 20 bits, 8MB */ - } - - its->device_ids = ids; + if (its->flags & ITS_FLAGS_WORKAROUND_CAVIUM_22375) + /* erratum 24313: ignore memory access type */ + cache = GITS_BASER_nCnB; for (i = 0; i < GITS_BASER_NR_REGS; i++) { struct its_baser *baser = its->tables + i; @@ -2741,6 +2732,8 @@ static void __maybe_unused its_enable_quirk_cavium_22375(void *data) { struct its_node *its = data; + /* erratum 22375: only alloc 8MB table size */ + its->device_ids = 0x14; /* 20 bits, 8MB */ its->flags |= ITS_FLAGS_WORKAROUND_CAVIUM_22375; } @@ -2942,6 +2935,7 @@ static int __init its_probe_one(struct resource *res, its->base = its_base; its->phys_base = res->start; its->ite_size = GITS_TYPER_ITT_ENTRY_SIZE(typer); + its->device_ids = GITS_TYPER_DEVBITS(typer); its->is_v4 = !!(typer & GITS_TYPER_VLPIS); if (its->is_v4) { if (!(typer & GITS_TYPER_VMOVP)) {