From patchwork Fri May 18 21:34:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jordan Crouse X-Patchwork-Id: 10412389 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id ACB066031B for ; Fri, 18 May 2018 22:06:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 97E5D28A81 for ; Fri, 18 May 2018 22:06:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8C6B028AA8; Fri, 18 May 2018 22:06:06 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 1D8AA28A81 for ; Fri, 18 May 2018 22:06:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=7Gd2WZpzMI8tj5X5JCb5CB3qzivs0gCTaViAlA7Eb9I=; b=Vx2En2C9yOD4EHrVkEyLJGThZ/ L/mi+JSzsAH7gUz0QUhSmOCRTXEEjyx9RU4GhG0jjpWXddMgw7DWM9XCpCnFSyQ+nd3GgVqHPsD7r KJ1tjFDXGZrYVA/y7FI1FJCuhmxxe6djesDxsLVAjk9UwQv03iSAwm7GWOlb1LoCpw9BEYgY5VRJ9 l/k+eaFfu/Af/fBCT+CmrzasP4rQAF6x5mkpE9I41ktqeqEd6ZB6kAnl4f+7FrMJPZ7yQODEKutSm VP8GBbR2MoFWZJyFZkU006JfefakFcsjxqOIb+XOm7bwH66b5fhg3MuZJRx2+mRQgBoHE3KTTlyrf z9RRXkow==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fJnVb-0000M6-Nm; Fri, 18 May 2018 22:05:55 +0000 Received: from merlin.infradead.org ([2001:8b0:10b:1231::1]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fJnV8-00005J-9j for linux-arm-kernel@bombadil.infradead.org; Fri, 18 May 2018 22:05:26 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=Fr2tNNFbrL+xXKmWG+8XIqpR2HHU2X+sr7ybCqF4bEs=; b=Avk4EGFqkXTFMFZVln1I8tJ6z 4Xb1Siw60YS0JrAO9JGz+DexkbZTe8qzQB9Xb+TzJ8vr4ZOIBFlZeyJOA6bCaFsBHI5x7u+z/GOEm 9EHXjnhwpPZw+yVmXeop+iqI2ehnoi+DTDrCu8d8z9t/oIP+C+diIF00rQhlQCe6c1/sGsqD17M8B H4B/81/7WtoIolXlwXelTVmh7s82hC18Dl6dqVcKn8DI59aK+/h5fGH9TVBEBbkxGpYon2jFU+NnO CqwjgcGiSgQ2F6CaQAN0oqAyOcyDwGfL5nFLK+ZZVKif3BlIQOtO3T02MD5fardN05zPkvEn/MHGg h0/o2SZ4w==; Received: from smtp.codeaurora.org ([198.145.29.96]) by merlin.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fJn2T-00067u-Lt for linux-arm-kernel@lists.infradead.org; Fri, 18 May 2018 21:35:50 +0000 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 9668360392; Fri, 18 May 2018 21:35:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1526679333; bh=3xxM8jMKgs4FK5NB8sf+9P+j6Cd7ulPhCCyzc0qla5U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=n/86f7YIkhsdvrxuHP5CD7c/v7mw6pJC+8i35JyRYd/LYR/U3NQaF5o7NquiShcN4 /0QJDnbmzVqsY4b+mBA/NGUi+jJyHg+pWFOaJKyCtKQnjN0CQJSD0i5rsKNTWBdUXB N82XqIIEc8ypNIF4LgqWj0TTc4kQshVQSPLaJTvA= Received: from jcrouse-lnx.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: jcrouse@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 017F661150; Fri, 18 May 2018 21:35:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1526679319; bh=3xxM8jMKgs4FK5NB8sf+9P+j6Cd7ulPhCCyzc0qla5U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Iez9hkG/HajySgeviUl19pPthcAVX7EZNnoFowCy3sKD5KTp0hcz6DDIw7hMyy3U8 eCjPxABVagNxFZ1E6eiPVZQzhDqHcgICTtfxQve5qcv7x+4pbzM8MhhJHy4Rk2CMhz 07Zf23xj268wZX3iuNKYUWdz4EYnM5Gdmlo8if+0= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 017F661150 Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=jcrouse@codeaurora.org From: Jordan Crouse To: freedreno@lists.freedesktop.org Subject: [PATCH 15/16] iommu: Gracefully allow drivers to not attach to a default domain Date: Fri, 18 May 2018 15:34:59 -0600 Message-Id: <20180518213500.31595-16-jcrouse@codeaurora.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180518213500.31595-1-jcrouse@codeaurora.org> References: <20180518213500.31595-1-jcrouse@codeaurora.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180518_173549_838406_1EAF0FEC X-CRM114-Status: GOOD ( 16.02 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: jean-philippe.brucker@arm.com, linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, tfiga@chromium.org, iommu@lists.linux-foundation.org, vivek.gautam@codeaurora.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Provide individual device drivers the chance to gracefully refuse to attach a device to the default domain. If the attach_device op returns -ENOTSUPP don't print a error message and don't set group->domain but still return success from iommu_group_add_dev(). This allows all the usual APIs to work and the next domain to try to attach will take group->domain for itself and everything will proceed as normal. Signed-off-by: Jordan Crouse --- drivers/iommu/iommu.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c index 0ba3d27f2300..a255b5d6c495 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -599,7 +599,7 @@ int iommu_group_add_device(struct iommu_group *group, struct device *dev) if (group->domain) ret = __iommu_attach_device(group->domain, dev); mutex_unlock(&group->mutex); - if (ret) + if (ret && ret != -ENOTSUPP) goto err_put_group; /* Notify any listeners about change to group. */ @@ -625,7 +625,8 @@ int iommu_group_add_device(struct iommu_group *group, struct device *dev) sysfs_remove_link(&dev->kobj, "iommu_group"); err_free_device: kfree(device); - pr_err("Failed to add device %s to group %d: %d\n", dev_name(dev), group->id, ret); + if (ret != -ENOTSUPP) + pr_err("Failed to add device %s to group %d: %d\n", dev_name(dev), group->id, ret); return ret; } EXPORT_SYMBOL_GPL(iommu_group_add_device); @@ -1238,8 +1239,16 @@ struct iommu_group *iommu_group_get_for_dev(struct device *dev) ret = iommu_group_add_device(group, dev); if (ret) { - iommu_group_put(group); - return ERR_PTR(ret); + /* + * If the driver chooses not to bind the device, reset + * group->domain so a new domain can be added later + */ + if (ret == -ENOTSUPP) + group->domain = NULL; + else { + iommu_group_put(group); + return ERR_PTR(ret); + } } return group;