From patchwork Fri Jan 7 17:21:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 530483 Delivered-To: patch@linaro.org Received: by 2002:ad5:544f:0:0:0:0:0 with SMTP id a15csp568727imp; Fri, 7 Jan 2022 09:34:31 -0800 (PST) X-Google-Smtp-Source: ABdhPJwoyrIhYZeF9pkGDtkGX8KCNJlmMLJfcSRAK62vh8lPmvMIu6MrPmhO9ClFfOSr2c3Gg9Yw X-Received: by 2002:a05:6602:2e8a:: with SMTP id m10mr3385717iow.209.1641576871470; Fri, 07 Jan 2022 09:34:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1641576871; cv=none; d=google.com; s=arc-20160816; b=nlPOWDjUPGwLG4wmZBvQuGS4FoRyNnT7v7Qt0EiRUX4QvZCm/V3ORBZ8PHTahBZZ8H VP2fY5EBETYNMA3YqlJL+xM7TTuQnhwTWOg9G/HfPseajGxy1yKg5fpx7xVkgZ3pCPMv uSmjOYR9sNRLKSXWD0BJ338JxkkqGZWMMbQ4WsW+9nGsY1FbeJsi4VorZNbvpLULpYie QH1rOH4a8wynIwhAgSUKDAI3lQTzRlHCyud1BWYvvC7T4vzpc6Ki2S1+4+5oicf7iqle l9/XQ27xQT8158dhrEy9lBTt3F+pV/5Nbtw9DwhX/Ah6Cwu7qJ68P9sRxUZczo6SKkUe grGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=OIDDMkIyA7MpvRn1rUvUntrwxdB6HAz6Cx4m2eprMqU=; b=OgEMP8BooWdSW8jlF8bxdE3NyY/+cErFsLuIGzDNXvdkwd9Myj39Uya8wgK3EYl0Jy 3Ta3MrwDwK+Be6e52Wd6e0CYc9+0jBUwfRsnVxJLqer7Cm+SMun97ehdWz4iQTuDcHBe qkQi0iwCerQ/4+8nIWD/UioOgocrRhzWI4BnappSmQF7k8CqKLX9NrvlWkyXbeWgh3ff D7fPCXRYtVQc/+vrsP2czABTx2w8hd06/dUCwauGbVbGtIvnucZ9o1PMWFG9SMmJ5ORJ bpv9Z49nbyP6AyTuYVt6NcA/ajwYHa9EFSYC6EKlbGYIkRF2FlAUO5CPkZtTSu4oVeyZ Mipg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=r+2K89bY; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id n22si686070ioz.9.2022.01.07.09.34.31 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 07 Jan 2022 09:34:31 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=r+2K89bY; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:37058 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n5t8I-0006TP-Us for patch@linaro.org; Fri, 07 Jan 2022 12:34:30 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48982) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n5sw3-00056S-Qa for qemu-devel@nongnu.org; Fri, 07 Jan 2022 12:21:53 -0500 Received: from [2a00:1450:4864:20::431] (port=47059 helo=mail-wr1-x431.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n5sw2-0007t5-4w for qemu-devel@nongnu.org; Fri, 07 Jan 2022 12:21:51 -0500 Received: by mail-wr1-x431.google.com with SMTP id l25so1495815wrb.13 for ; Fri, 07 Jan 2022 09:21:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=OIDDMkIyA7MpvRn1rUvUntrwxdB6HAz6Cx4m2eprMqU=; b=r+2K89bY2aZgaNEybGtQDFDuPirf8SpZbGEqqeX8UQIbD8jU4sEW4Si9R7zTSEVqqL bSxisAoQdxmfAKC4Q6EwqKExmFd5TLRVy47ylra7Lqcgap1DdmUzdq/PqdGvIKXyf5Hx 4bDNczs4nhO6RJrXwsVOymEOuYCGaTLfrUrqyf2xBRrawju1sKAxsNCAupf0XVB5Bk/X Hlt8Fsr6+osdxTTHAlgtfJSsQkWkHckZIjJtmxLD6wAP/zZHXr2YMrRaJY1fmSECV1eO 55l2PTk5l5nhgbOAGele8dsA3uYOrF7q0P91lbb96yAzgfnq7DXHcYXZ7vpg3Qi5DDxM xVGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=OIDDMkIyA7MpvRn1rUvUntrwxdB6HAz6Cx4m2eprMqU=; b=BZzrDQuwN3pIoCbBySF7icR0iYe4oXA7PwtEVUptOrovDdtDUcswNYN7gtAh6hGczl 1m9X6tnMWVtKJC9fO8d0+lycFtsQ/0Mcbafx2mSVvCgWGGvFbdNAwz3kiqaTJaNHoCi7 52SIz2EGQ7pcA26ziyQWoIxxlnPXl63dqpYkF8QjEQVYhhP5FbrQ8MWSTzsAGgVI66Yp +6DwGWm2Re6CxkTWMnamyZ7zeyvX6fkNqghl41mSvMrL0eTF95kLNei9c/hbDnXAd0Eg maRhoa0I2HmngHUKbT+cWgHxnt6EANmdXRqMIgohym/vb87WZfHW7+mv66bgeAncPp5s Z5lQ== X-Gm-Message-State: AOAM531jY+iYLq77CyuZke5zez2pK/4pSX5G6ITFxFL9v/yXS0Ge+QxX QZP4ZnF1uXyZplsXqoLiqJAGLFFD4sbvTA== X-Received: by 2002:adf:b60e:: with SMTP id f14mr32534972wre.11.1641576108846; Fri, 07 Jan 2022 09:21:48 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id i6sm6060219wrf.79.2022.01.07.09.21.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jan 2022 09:21:48 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 07/19] hw/intc/arm_gicv3_its: Reduce code duplication in extract_table_params() Date: Fri, 7 Jan 2022 17:21:30 +0000 Message-Id: <20220107172142.2651911-8-peter.maydell@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220107172142.2651911-1-peter.maydell@linaro.org> References: <20220107172142.2651911-1-peter.maydell@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::431 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::431; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x431.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The extract_table_params() decodes the fields in the GITS_BASER registers into TableDesc structs. Since the fields are the same for all the GITS_BASER registers, there is currently a lot of code duplication within the switch (type) statement. Refactor so that the cases include only what is genuinely different for each type: the calculation of the number of bits in the ID value that indexes into the table. Signed-off-by: Peter Maydell Reviewed-by: Alex Bennée Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé --- hw/intc/arm_gicv3_its.c | 97 +++++++++++++++++------------------------ 1 file changed, 40 insertions(+), 57 deletions(-) diff --git a/hw/intc/arm_gicv3_its.c b/hw/intc/arm_gicv3_its.c index c97b9982ae1..84808b1e298 100644 --- a/hw/intc/arm_gicv3_its.c +++ b/hw/intc/arm_gicv3_its.c @@ -758,6 +758,9 @@ static void extract_table_params(GICv3ITSState *s) uint64_t value; for (int i = 0; i < 8; i++) { + TableDesc *td; + int idbits; + value = s->baser[i]; if (!value) { @@ -789,73 +792,53 @@ static void extract_table_params(GICv3ITSState *s) type = FIELD_EX64(value, GITS_BASER, TYPE); switch (type) { - case GITS_BASER_TYPE_DEVICE: - memset(&s->dt, 0 , sizeof(s->dt)); - s->dt.valid = FIELD_EX64(value, GITS_BASER, VALID); - - if (!s->dt.valid) { - break; - } - - s->dt.page_sz = page_sz; - s->dt.indirect = FIELD_EX64(value, GITS_BASER, INDIRECT); - s->dt.entry_sz = FIELD_EX64(value, GITS_BASER, ENTRYSIZE); - - if (!s->dt.indirect) { - s->dt.max_entries = (num_pages * page_sz) / s->dt.entry_sz; - } else { - s->dt.max_entries = (((num_pages * page_sz) / - L1TABLE_ENTRY_SIZE) * - (page_sz / s->dt.entry_sz)); - } - - s->dt.max_ids = (1UL << (FIELD_EX64(s->typer, GITS_TYPER, - DEVBITS) + 1)); - - s->dt.base_addr = baser_base_addr(value, page_sz); - + td = &s->dt; + idbits = FIELD_EX64(s->typer, GITS_TYPER, DEVBITS) + 1; break; - case GITS_BASER_TYPE_COLLECTION: - memset(&s->ct, 0 , sizeof(s->ct)); - s->ct.valid = FIELD_EX64(value, GITS_BASER, VALID); - - /* - * GITS_TYPER.HCC is 0 for this implementation - * hence writes are discarded if ct.valid is 0 - */ - if (!s->ct.valid) { - break; - } - - s->ct.page_sz = page_sz; - s->ct.indirect = FIELD_EX64(value, GITS_BASER, INDIRECT); - s->ct.entry_sz = FIELD_EX64(value, GITS_BASER, ENTRYSIZE); - - if (!s->ct.indirect) { - s->ct.max_entries = (num_pages * page_sz) / s->ct.entry_sz; - } else { - s->ct.max_entries = (((num_pages * page_sz) / - L1TABLE_ENTRY_SIZE) * - (page_sz / s->ct.entry_sz)); - } - + td = &s->ct; if (FIELD_EX64(s->typer, GITS_TYPER, CIL)) { - s->ct.max_ids = (1UL << (FIELD_EX64(s->typer, - GITS_TYPER, CIDBITS) + 1)); + idbits = FIELD_EX64(s->typer, GITS_TYPER, CIDBITS) + 1; } else { /* 16-bit CollectionId supported when CIL == 0 */ - s->ct.max_ids = (1UL << 16); + idbits = 16; } - - s->ct.base_addr = baser_base_addr(value, page_sz); - break; - default: - break; + /* + * GITS_BASER.TYPE is read-only, so GITS_BASER_RO_MASK + * ensures we will only see type values corresponding to + * the values set up in gicv3_its_reset(). + */ + g_assert_not_reached(); } + + memset(td, 0, sizeof(*td)); + td->valid = FIELD_EX64(value, GITS_BASER, VALID); + /* + * If GITS_BASER.Valid is 0 for any then we will not process + * interrupts. (GITS_TYPER.HCC is 0 for this implementation, so we + * do not have a special case where the GITS_BASER.Valid bit is 0 + * for the register corresponding to the Collection table but we + * still have to process interrupts using non-memory-backed + * Collection table entries.) + */ + if (!td->valid) { + continue; + } + td->page_sz = page_sz; + td->indirect = FIELD_EX64(value, GITS_BASER, INDIRECT); + td->entry_sz = FIELD_EX64(value, GITS_BASER, ENTRYSIZE); + td->base_addr = baser_base_addr(value, page_sz); + if (!td->indirect) { + td->max_entries = (num_pages * page_sz) / td->entry_sz; + } else { + td->max_entries = (((num_pages * page_sz) / + L1TABLE_ENTRY_SIZE) * + (page_sz / td->entry_sz)); + } + td->max_ids = 1ULL << idbits; } }