From patchwork Tue May 26 12:59:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: You-Sheng Yang X-Patchwork-Id: 1297989 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49WYxD74M1z9sSk; Tue, 26 May 2020 23:01:04 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1jdZCW-0004Gu-0v; Tue, 26 May 2020 13:01:00 +0000 Received: from mail-pj1-f65.google.com ([209.85.216.65]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1jdZCR-0004Bs-A6 for kernel-team@lists.ubuntu.com; Tue, 26 May 2020 13:00:55 +0000 Received: by mail-pj1-f65.google.com with SMTP id z15so4776538pjb.0 for ; Tue, 26 May 2020 06:00:55 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Dr6TzX0Z4/4wrJMEm9zIode1Z8iPib2bYlWijA3vmpY=; b=VhdE4JVZ09HZLxC8LJozhRAdTpVuwol05eBt43VdREzFZ4WGrfrxURIaWZ+eG0Ebum h6GL8WWXQAdv+aKuZR4NHUllKfkkeR+GF/XIJ+NFrI57xvPj2yYb8ENlPo+JSMp3wURA Ztl1HFWxJFlLhnyZwf4O+uZn6e7fo/beQk7wGbxmMLIATUBDJViVo/j/XmV8RCfumrOY 2DZBgDjHR8SmV1Xy7EqouyMa4ktmsy3re9J++mjz91iSTRNRhXNMSIkVugrzYzV2t4Zk 7OVkqe2SuYy2NkBSKuWj0PiBJ0G0Fr0R513kDu6kWXjQPBTWwK/2rZiy4QN/OGmIj3kj xIuQ== X-Gm-Message-State: AOAM5326yAs9MYJmN0YhCWVneAhpULhSePUYM8WCitKkrrjuGoAU4x+t Nz7U27a+uTrfkH3i+0NWocwg/AaV4jE= X-Google-Smtp-Source: ABdhPJz6iPYQPl2DRfo0gxRp5NagoClZAe/g2rUwhLDoFKkF1suoltEXzHJQJDUc5LzZYjtlhmfbDA== X-Received: by 2002:a17:90a:bf08:: with SMTP id c8mr26723689pjs.13.1590498052300; Tue, 26 May 2020 06:00:52 -0700 (PDT) Received: from localhost (61-220-137-37.HINET-IP.hinet.net. [61.220.137.37]) by smtp.gmail.com with ESMTPSA id d21sm10962804pfd.109.2020.05.26.06.00.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2020 06:00:51 -0700 (PDT) From: You-Sheng Yang To: kernel-team@lists.ubuntu.com Subject: [PATCH 18/42][SRU][U] UBUNTU: SAUCE: iommu/pamu: Convert to probe/release_device() call-backs Date: Tue, 26 May 2020 20:59:30 +0800 Message-Id: <20200526125954.237403-19-vicamo.yang@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200526125954.237403-1-vicamo.yang@canonical.com> References: <20200526125954.237403-1-vicamo.yang@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Joerg Roedel BugLink: https://bugs.launchpad.net/bugs/1876707 Convert the PAMU IOMMU driver to use the probe_device() and release_device() call-backs of iommu_ops, so that the iommu core code does the group and sysfs setup. Signed-off-by: Joerg Roedel Link: https://lore.kernel.org/r/20200429133712.31431-19-joro@8bytes.org Signed-off-by: Joerg Roedel (cherry picked from commit 52dd3ca4176f7f87452ee4b9d9a6d2e57ac4ccb7 iommu/next) Signed-off-by: You-Sheng Yang --- drivers/iommu/fsl_pamu_domain.c | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/drivers/iommu/fsl_pamu_domain.c b/drivers/iommu/fsl_pamu_domain.c index 06828e2698d5..928d37771ece 100644 --- a/drivers/iommu/fsl_pamu_domain.c +++ b/drivers/iommu/fsl_pamu_domain.c @@ -1016,25 +1016,13 @@ static struct iommu_group *fsl_pamu_device_group(struct device *dev) return group; } -static int fsl_pamu_add_device(struct device *dev) +static struct iommu_device *fsl_pamu_probe_device(struct device *dev) { - struct iommu_group *group; - - group = iommu_group_get_for_dev(dev); - if (IS_ERR(group)) - return PTR_ERR(group); - - iommu_group_put(group); - - iommu_device_link(&pamu_iommu, dev); - - return 0; + return &pamu_iommu; } -static void fsl_pamu_remove_device(struct device *dev) +static void fsl_pamu_release_device(struct device *dev) { - iommu_device_unlink(&pamu_iommu, dev); - iommu_group_remove_device(dev); } static const struct iommu_ops fsl_pamu_ops = { @@ -1048,8 +1036,8 @@ static const struct iommu_ops fsl_pamu_ops = { .iova_to_phys = fsl_pamu_iova_to_phys, .domain_set_attr = fsl_pamu_set_domain_attr, .domain_get_attr = fsl_pamu_get_domain_attr, - .add_device = fsl_pamu_add_device, - .remove_device = fsl_pamu_remove_device, + .probe_device = fsl_pamu_probe_device, + .release_device = fsl_pamu_release_device, .device_group = fsl_pamu_device_group, };