From patchwork Thu Apr 18 17:26:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 162512 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp1013676jan; Thu, 18 Apr 2019 10:26:36 -0700 (PDT) X-Google-Smtp-Source: APXvYqz6QsdZ2zljcBCQ2mlhbXg7uHj2P4voL6Jx1lvOg93+VkWJP2OBRODNuApRqjtaQ/DuVr+V X-Received: by 2002:aa7:8518:: with SMTP id v24mr97625707pfn.219.1555608396344; Thu, 18 Apr 2019 10:26:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1555608396; cv=none; d=google.com; s=arc-20160816; b=m0HoVbfB+V9RO0Zog1YcKFzHLq+r1aqrMdyv7iMPJSx5f3XQMQr+x2YSsYxEfZ4Yc4 41xtzQyUXaIdKQln6tu1sIHbjCSo8ghS/xelIJoHmWV9fOvdU6kemcbxdPt2KABWHaAR OQJVwH/yTiLCorfh5EkxsYj//oTV1oX2KIkz360S4rWO3LQEpcSJwb4WELuG3q34Gw91 gSbDklK9XUvp4OQ7RWgcUYTxoeQ0of7oyFKLlmOwJTllJs4AszbjeM/YIIf+J7eIzV2N qAH9MvSKuDvu0iZOQsQckqvcKCZ1jYd35D5Uwtpqdo7rnSDxpo7S4HFNdMxHQYgUiisj Vafg== 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; bh=UDZmQ6iP/tnTw03Zb49yqFPwqX8HpgNWDsR4uz+K9Os=; b=eaRe5a6dK5zrp0YaGUGr97/ZyMHS/ZeNr8xyMIE+IcF0GaqCGKnZr4CtaqoDNFUzI9 6bVDzmdsqIobU8gWYsE7qAZf2yyf2R95Lwwu5ZGS5ItqdZq4W46DUEnJcE7euNro0YEd H5TSI37HXxwwNvr1V069JCzgR7DL1L+PSrDmPpwlXK8jT+h8gMxKYP3YnWkSCblvtdCN xb0mhniNKFkr2uKLAnqlYO6yL7ga1Zd6llTyrtvWzVI2SrhcuOCYBRY3iYkfmkFby324 noymKJvVRWZtH50AnTzRwMssB4cj2jfLF20UHJJ3Nl7wc9Hr0XC/yBdY8/Nej7B8cTJ4 FFKQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-rt-users-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-rt-users-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id i37si2416807pgb.436.2019.04.18.10.26.36; Thu, 18 Apr 2019 10:26:36 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-rt-users-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-rt-users-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-rt-users-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389873AbfDRR0f (ORCPT + 3 others); Thu, 18 Apr 2019 13:26:35 -0400 Received: from foss.arm.com ([217.140.101.70]:38120 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389850AbfDRR0e (ORCPT ); Thu, 18 Apr 2019 13:26:34 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 885651688; Thu, 18 Apr 2019 10:26:33 -0700 (PDT) Received: from e108454-lin.cambridge.arm.com (e108454-lin.cambridge.arm.com [10.1.196.50]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 50D883F557; Thu, 18 Apr 2019 10:26:31 -0700 (PDT) From: Julien Grall To: linux-kernel@vger.kernel.org, iommu@lists.linux-foundation.org Cc: logang@deltatee.com, douliyangs@gmail.com, miquel.raynal@bootlin.com, marc.zyngier@arm.com, jason@lakedaemon.net, tglx@linutronix.de, joro@8bytes.org, robin.murphy@arm.com, bigeasy@linutronix.de, linux-rt-users@vger.kernel.org, Julien Grall Subject: [PATCH 5/7] irqchip/ls-scfg-msi: Don't map the MSI page in ls_scfg_msi_compose_msg Date: Thu, 18 Apr 2019 18:26:09 +0100 Message-Id: <20190418172611.21561-6-julien.grall@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190418172611.21561-1-julien.grall@arm.com> References: <20190418172611.21561-1-julien.grall@arm.com> Sender: linux-rt-users-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rt-users@vger.kernel.org The function ls_scfg_msi_compose_msg may be called from non-preemptible context. However, on RT, iommu_dma_map_msi_msg requires to be called from a preemptible context. A recent patch split the function iommu_dma_map_msi_msg in 2 functions: one that should be called in preemptible context, the other does not have any requirement. This patch reworks the FreeScale SCFG MSI driver to avoid executing preemptible code in non-preemptible context by preparing the MSI mapping when allocating the MSI interrupt. Signed-off-by: Julien Grall --- drivers/irqchip/irq-ls-scfg-msi.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) -- 2.11.0 diff --git a/drivers/irqchip/irq-ls-scfg-msi.c b/drivers/irqchip/irq-ls-scfg-msi.c index c671b3212010..8099c5b1fcb5 100644 --- a/drivers/irqchip/irq-ls-scfg-msi.c +++ b/drivers/irqchip/irq-ls-scfg-msi.c @@ -100,7 +100,7 @@ static void ls_scfg_msi_compose_msg(struct irq_data *data, struct msi_msg *msg) msg->data |= cpumask_first(mask); } - iommu_dma_map_msi_msg(data->irq, msg); + iommu_dma_compose_msi_msg(data->irq, msg); } static int ls_scfg_msi_set_affinity(struct irq_data *irq_data, @@ -141,6 +141,7 @@ static int ls_scfg_msi_domain_irq_alloc(struct irq_domain *domain, unsigned int nr_irqs, void *args) { + msi_alloc_info_t *info = args; struct ls_scfg_msi *msi_data = domain->host_data; int pos, err = 0; @@ -157,6 +158,10 @@ static int ls_scfg_msi_domain_irq_alloc(struct irq_domain *domain, if (err) return err; + err = iommu_dma_prepare_msi(info->desc, msi_data->msiir_addr); + if (err) + return err; + irq_domain_set_info(domain, virq, pos, &ls_scfg_msi_parent_chip, msi_data, handle_simple_irq, NULL, NULL);