From patchwork Tue Apr 19 17:13:08 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Auger Eric X-Patchwork-Id: 66128 Delivered-To: patches@linaro.org Received: by 10.140.93.198 with SMTP id d64csp1978142qge; Tue, 19 Apr 2016 10:13:35 -0700 (PDT) X-Received: by 10.195.13.135 with SMTP id ey7mr4225360wjd.161.1461086008794; Tue, 19 Apr 2016 10:13:28 -0700 (PDT) Return-Path: Received: from mail-wm0-x234.google.com (mail-wm0-x234.google.com. [2a00:1450:400c:c09::234]) by mx.google.com with ESMTPS id r6si5280218wmg.8.2016.04.19.10.13.28 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 19 Apr 2016 10:13:28 -0700 (PDT) Received-SPF: pass (google.com: domain of eric.auger@linaro.org designates 2a00:1450:400c:c09::234 as permitted sender) client-ip=2a00:1450:400c:c09::234; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: domain of eric.auger@linaro.org designates 2a00:1450:400c:c09::234 as permitted sender) smtp.mailfrom=eric.auger@linaro.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: by mail-wm0-x234.google.com with SMTP id v188so171077690wme.1 for ; Tue, 19 Apr 2016 10:13:28 -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=dofcHsSfZYXvgtcgCsbzKTOqxUuSIqGrMQpmvsuRCpc=; b=DL1cZZUdmCE2DnBL5Q3usuudIWnMQ+QGBye48Y83rUMQqVg1bUEPqa8qtV50F99K8A HbAS5ZlPXEgZME6hDqJ9F+JnfIyxjUjOnJNZ56u0qB2Bm/4A/PXvF/pd00XDr3h7N+pp tfAByJDP1H7zHrauxGv7FgA4J1VtzR2sXmh6U= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=dofcHsSfZYXvgtcgCsbzKTOqxUuSIqGrMQpmvsuRCpc=; b=Lv/NrpZKC+o5p0eI8hYBbFOedx87QhZGV9hsLCKnwD9lcoI0xucSx9Px6F0akLX8rC WsuTfdd8bF4PeWR+dZrknLaH7Tlbw+nh/y9GnY4UZMct9CCNDJr7jN7yU4KoWT72nh0X JNr6kDAc9rxj7YMtsf1HoyHQ6DBoH4pM9CTW2Tt+vpQkmUv7eYi6F4InXRSzEG1jWp7d S4lFR5MRo5oew07stuhsBOdXKNEZYVx8Cphm1IRNSvZbzPfXZ7vG4HElbVewG4IyEpS4 CIVOjmAKuw7JAftgjhdGIymJzj0/zgdOzKga/+l2Ne1PbFoaJbE6mDLSuMeWWyIfg2G9 iV1A== X-Gm-Message-State: AOPr4FUtjB7ZjxSa45dmdG1nqseQbpIEGd5QXi2/kKjOyKKlYexkFwLwyPN92QT1oz7tj+8Ay4M= X-Received: by 10.28.148.19 with SMTP id w19mr4789753wmd.10.1461086008521; Tue, 19 Apr 2016 10:13:28 -0700 (PDT) Return-Path: Received: from new-host-34.home (LMontsouris-657-1-37-90.w80-11.abo.wanadoo.fr. [80.11.198.90]) by smtp.gmail.com with ESMTPSA id gr4sm1243604wjd.23.2016.04.19.10.13.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 19 Apr 2016 10:13:27 -0700 (PDT) From: Eric Auger To: eric.auger@st.com, eric.auger@linaro.org, robin.murphy@arm.com, alex.williamson@redhat.com, will.deacon@arm.com, joro@8bytes.org, tglx@linutronix.de, jason@lakedaemon.net, marc.zyngier@arm.com, christoffer.dall@linaro.org, linux-arm-kernel@lists.infradead.org Cc: patches@linaro.org, linux-kernel@vger.kernel.org, Bharat.Bhushan@freescale.com, pranav.sawargaonkar@gmail.com, p.fedin@samsung.com, iommu@lists.linux-foundation.org, Jean-Philippe.Brucker@arm.com, julien.grall@arm.com Subject: [PATCH v7 6/8] irqchip/gicv2m: implement msi_doorbell_info callback Date: Tue, 19 Apr 2016 17:13:08 +0000 Message-Id: <1461085990-2547-7-git-send-email-eric.auger@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1461085990-2547-1-git-send-email-eric.auger@linaro.org> References: <1461085990-2547-1-git-send-email-eric.auger@linaro.org> This patch implements the msi_doorbell_info callback in the gicv2m driver. The driver now is able to return its doorbell characteristics (base, size, prot). A single doorbell is exposed. This will allow the msi layer to iommu_map this doorbell when requested. Signed-off-by: Eric Auger --- v7: creation --- drivers/irqchip/irq-gic-v2m.c | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) -- 1.9.1 diff --git a/drivers/irqchip/irq-gic-v2m.c b/drivers/irqchip/irq-gic-v2m.c index 28f047c..54690b9 100644 --- a/drivers/irqchip/irq-gic-v2m.c +++ b/drivers/irqchip/irq-gic-v2m.c @@ -24,6 +24,8 @@ #include #include #include +#include +#include /* * MSI_TYPER: @@ -64,6 +66,7 @@ struct v2m_data { u32 nr_spis; /* The number of SPIs for MSIs */ unsigned long *bm; /* MSI vector bitmap */ u32 flags; /* v2m flags for specific implementation */ + struct irq_chip_msi_doorbell_info doorbell_info; }; static void gicv2m_mask_msi_irq(struct irq_data *d) @@ -105,6 +108,16 @@ static void gicv2m_compose_msi_msg(struct irq_data *data, struct msi_msg *msg) msg->data -= v2m->spi_start; } +static const struct irq_chip_msi_doorbell_info * +gicv2m_msi_doorbell_info(struct irq_data *data) +{ + struct v2m_data *v2m = irq_data_get_irq_chip_data(data); + + if (!v2m) + return NULL; + return (const struct irq_chip_msi_doorbell_info *)(&v2m->doorbell_info); +} + static struct irq_chip gicv2m_irq_chip = { .name = "GICv2m", .irq_mask = irq_chip_mask_parent, @@ -112,6 +125,7 @@ static struct irq_chip gicv2m_irq_chip = { .irq_eoi = irq_chip_eoi_parent, .irq_set_affinity = irq_chip_set_affinity_parent, .irq_compose_msi_msg = gicv2m_compose_msi_msg, + .msi_doorbell_info = gicv2m_msi_doorbell_info, }; static int gicv2m_irq_gic_domain_alloc(struct irq_domain *domain, @@ -247,6 +261,7 @@ static void gicv2m_teardown(void) list_for_each_entry_safe(v2m, tmp, &v2m_nodes, entry) { list_del(&v2m->entry); + free_percpu(v2m->doorbell_info.percpu_doorbells); kfree(v2m->bm); iounmap(v2m->base); of_node_put(to_of_node(v2m->fwnode)); @@ -299,6 +314,7 @@ static int __init gicv2m_init_one(struct fwnode_handle *fwnode, { int ret; struct v2m_data *v2m; + struct irq_chip_msi_doorbell __percpu *doorbell; v2m = kzalloc(sizeof(struct v2m_data), GFP_KERNEL); if (!v2m) { @@ -311,11 +327,23 @@ static int __init gicv2m_init_one(struct fwnode_handle *fwnode, memcpy(&v2m->res, res, sizeof(struct resource)); + v2m->doorbell_info.percpu_doorbells = + alloc_percpu(struct irq_chip_msi_doorbell); + if (WARN_ON(!v2m->doorbell_info.percpu_doorbells)) { + ret = -ENOMEM; + goto err_free_v2m; + } + doorbell = per_cpu_ptr(v2m->doorbell_info.percpu_doorbells, 0); + doorbell->base = v2m->res.start; + doorbell->size = 4; + doorbell->prot = IOMMU_WRITE; + v2m->doorbell_info.nb_doorbells = 1; + v2m->base = ioremap(v2m->res.start, resource_size(&v2m->res)); if (!v2m->base) { pr_err("Failed to map GICv2m resource\n"); ret = -ENOMEM; - goto err_free_v2m; + goto err_free_v2m_doorbells; } if (spi_start && nr_spis) { @@ -359,6 +387,8 @@ static int __init gicv2m_init_one(struct fwnode_handle *fwnode, err_iounmap: iounmap(v2m->base); +err_free_v2m_doorbells: + free_percpu(v2m->doorbell_info.percpu_doorbells); err_free_v2m: kfree(v2m); return ret;