Received: by 2002:a25:824b:0:0:0:0:0 with SMTP id d11csp1473233ybn; Wed, 25 Sep 2019 19:18:28 -0700 (PDT) X-Google-Smtp-Source: APXvYqy7gA7CsCYwUDwxxBkix5QfKYCGnrDesVBwRYgGAEBz9ZL60ahqnwmfcaaAnJT+XmSTf30q X-Received: by 2002:a17:907:11c8:: with SMTP id va8mr1095868ejb.111.1569464308782; Wed, 25 Sep 2019 19:18:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569464308; cv=none; d=google.com; s=arc-20160816; b=COX7FqWRsgJT0J90SWGhQL9JRry+sX/nwO0ZenOIvj0Jqfz7vm5u41vwO7ZnUFZZbM 2WZRl90+MgUIHEq3hgwRhy2LZk9nUKCJNh/SVflL0fWgT3PMBETlDJex+YbSiFo0L+Ja fbuKHJAVJHueLwgWI0X/DZOudzNJQK4eIqaZadMEDINJWF7EXNT0DBXQHADYBrD2meo4 2CGvbkFX7o+0nHacvXGRQTNohFbXPQPjJLnpm6nFMJrqGkanFHKrvNjivSUe9ynL5qTa x1Pvw7sbXxCoqyNqqNBR1jDoKvF4BYNYHhSExZguSynQO/6X2MldRwytMg+QhZ0rEkam R+3Q== 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; bh=a8AvEiIu83OnMig+oESqKfcvUu9m2f5to0E2ujplxOI=; b=QTLxC/JsD3cOk2TnYUm49jMz2aiY5K/qdkwh3ydqqFqmgvdPAFo3XL/frWVc3VjhwP 6346XtOZEGucNEAuNB8b4vVOdsISC0FgBgooW5yu/X5UgikjsvuHB6yF0SVQ+/l5miDq 1p1TaCeo9vRIaA59zXsZVUjNnA9zCss6jQG63WHvBrMC7HnHdQVoEZcJ+5WclF37msEr YoXanrgxJdUhQWv4sEEpD9IvPWgjhxk/6pLI7kA78AD6X6xSSpe3zhYOKT4JJ0OpNkfT 5MHg85JPm490B8YBz4oMAaArFsmJw3du3acJc4EdqyeRt7l4qonxw45jSI/A3GuDEUw7 DA4Q== ARC-Authentication-Results: i=1; mx.google.com; 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=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id va7si350229ejb.4.2019.09.25.19.18.04; Wed, 25 Sep 2019 19:18:28 -0700 (PDT) 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; 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=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2407609AbfIWS2H (ORCPT + 99 others); Mon, 23 Sep 2019 14:28:07 -0400 Received: from foss.arm.com ([217.140.110.172]:47124 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733027AbfIWS2E (ORCPT ); Mon, 23 Sep 2019 14:28:04 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 8114522F8; Mon, 23 Sep 2019 11:28:04 -0700 (PDT) Received: from big-swifty.lan (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id E8A783F694; Mon, 23 Sep 2019 11:28:01 -0700 (PDT) From: Marc Zyngier To: kvmarm@lists.cs.columbia.edu, linux-kernel@vger.kernel.org Cc: Eric Auger , James Morse , Julien Thierry , Suzuki K Poulose , Thomas Gleixner , Jason Cooper , Lorenzo Pieralisi , Andrew Murray Subject: [PATCH 26/35] irqchip/gic-v4.1: Plumb get/set_irqchip_state SGI callbacks Date: Mon, 23 Sep 2019 19:25:57 +0100 Message-Id: <20190923182606.32100-27-maz@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190923182606.32100-1-maz@kernel.org> References: <20190923182606.32100-1-maz@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org To implement the get/set_irqchip_state callbacks (limited to the PENDING state), we have to use a particular set of hacks: - Reading the pending state is done by using a pair of new redistributor registers (GICR_VSGIR, GICR_VSGIPENDR), which allow the 16 interrupts state to be retrieved. - Setting the pending state is done by generating it as we'd otherwise do for a guest (writing to GITS_SGIR) - Clearing the pending state is done by emiting a VSGI command with the "clear" bit set. Signed-off-by: Marc Zyngier --- drivers/irqchip/irq-gic-v3-its.c | 56 ++++++++++++++++++++++++++++++ include/linux/irqchip/arm-gic-v3.h | 14 ++++++++ 2 files changed, 70 insertions(+) diff --git a/drivers/irqchip/irq-gic-v3-its.c b/drivers/irqchip/irq-gic-v3-its.c index 727a890f72ae..5e67dfe1c4b1 100644 --- a/drivers/irqchip/irq-gic-v3-its.c +++ b/drivers/irqchip/irq-gic-v3-its.c @@ -3683,11 +3683,67 @@ static int its_sgi_set_affinity(struct irq_data *d, return -EINVAL; } +static int its_sgi_set_irqchip_state(struct irq_data *d, + enum irqchip_irq_state which, + bool state) +{ + if (which != IRQCHIP_STATE_PENDING) + return -EINVAL; + + if (state) { + struct its_vpe *vpe = irq_data_get_irq_chip_data(d); + struct its_node *its = find_4_1_its(); + u64 val; + + val = FIELD_PREP(GITS_SGIR_VPEID, vpe->vpe_id); + val |= FIELD_PREP(GITS_SGIR_VINTID, d->hwirq); + writeq_relaxed(val, its->sgir_base + GITS_SGIR - SZ_128K); + } else { + its_configure_sgi(d, true); + } + + return 0; +} + +static int its_sgi_get_irqchip_state(struct irq_data *d, + enum irqchip_irq_state which, bool *val) +{ + struct its_vpe *vpe = irq_data_get_irq_chip_data(d); + void __iomem *base = gic_data_rdist_cpu(vpe->col_idx)->rd_base + SZ_128K; + u32 count = 1000000; /* 1s! */ + u32 status; + + if (which != IRQCHIP_STATE_PENDING) + return -EINVAL; + + writel_relaxed(vpe->vpe_id, base + GICR_VSGIR); + do { + status = readl_relaxed(base + GICR_VSGIPENDR); + if (!(status & GICR_VSGIPENDR_BUSY)) + goto out; + + count--; + if (!count) { + pr_err_ratelimited("Unable to get SGI status\n"); + goto out; + } + cpu_relax(); + udelay(1); + } while(count); + +out: + *val = !!(status & (1 << d->hwirq)); + + return 0; +} + static struct irq_chip its_sgi_irq_chip = { .name = "GICv4.1-sgi", .irq_mask = its_sgi_mask_irq, .irq_unmask = its_sgi_unmask_irq, .irq_set_affinity = its_sgi_set_affinity, + .irq_set_irqchip_state = its_sgi_set_irqchip_state, + .irq_get_irqchip_state = its_sgi_get_irqchip_state, }; static int its_sgi_irq_domain_alloc(struct irq_domain *domain, diff --git a/include/linux/irqchip/arm-gic-v3.h b/include/linux/irqchip/arm-gic-v3.h index c73176d3ab2b..cb8563554ed2 100644 --- a/include/linux/irqchip/arm-gic-v3.h +++ b/include/linux/irqchip/arm-gic-v3.h @@ -340,6 +340,15 @@ #define GICR_VPENDBASER_4_1_VGRP1EN (1ULL << 58) #define GICR_VPENDBASER_4_1_VPEID GENMASK_ULL(15, 0) +#define GICR_VSGIR 0x0080 + +#define GICR_VSGIR_VPEID GENMASK(15, 0) + +#define GICR_VSGIPENDR 0x0088 + +#define GICR_VSGIPENDR_BUSY (1U << 31) +#define GICR_VSGIPENDR_PENDING GENMASK(15, 0) + /* * ITS registers, offsets from ITS_base */ @@ -363,6 +372,11 @@ #define GITS_TRANSLATER 0x10040 +#define GITS_SGIR 0x20020 + +#define GITS_SGIR_VPEID GENMASK_ULL(47, 32) +#define GITS_SGIR_VINTID GENMASK_ULL(7, 0) + #define GITS_CTLR_ENABLE (1U << 0) #define GITS_CTLR_ImDe (1U << 1) #define GITS_CTLR_ITS_NUMBER_SHIFT 4 -- 2.20.1