lkml.org 
[lkml]   [2021]   [Jul]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 03/24] iommu/arm-smmu: Drop IOVA cookie management
    Date
    The core code bakes its own cookies now.

    Signed-off-by: Robin Murphy <robin.murphy@arm.com>
    ---
    drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 7 -------
    drivers/iommu/arm/arm-smmu/arm-smmu.c | 15 ++++-----------
    drivers/iommu/arm/arm-smmu/qcom_iommu.c | 8 --------
    3 files changed, 4 insertions(+), 26 deletions(-)

    diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
    index 6346f21726f4..4c648da447bf 100644
    --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
    +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
    @@ -1984,12 +1984,6 @@ static struct iommu_domain *arm_smmu_domain_alloc(unsigned type)
    if (!smmu_domain)
    return NULL;

    - if (type == IOMMU_DOMAIN_DMA &&
    - iommu_get_dma_cookie(&smmu_domain->domain)) {
    - kfree(smmu_domain);
    - return NULL;
    - }
    -
    mutex_init(&smmu_domain->init_mutex);
    INIT_LIST_HEAD(&smmu_domain->devices);
    spin_lock_init(&smmu_domain->devices_lock);
    @@ -2021,7 +2015,6 @@ static void arm_smmu_domain_free(struct iommu_domain *domain)
    struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain);
    struct arm_smmu_device *smmu = smmu_domain->smmu;

    - iommu_put_dma_cookie(domain);
    free_io_pgtable_ops(smmu_domain->pgtbl_ops);

    /* Free the CD and ASID, if we allocated them */
    diff --git a/drivers/iommu/arm/arm-smmu/arm-smmu.c b/drivers/iommu/arm/arm-smmu/arm-smmu.c
    index ac21170fa208..970d9e4dcd69 100644
    --- a/drivers/iommu/arm/arm-smmu/arm-smmu.c
    +++ b/drivers/iommu/arm/arm-smmu/arm-smmu.c
    @@ -868,10 +868,10 @@ static struct iommu_domain *arm_smmu_domain_alloc(unsigned type)
    {
    struct arm_smmu_domain *smmu_domain;

    - if (type != IOMMU_DOMAIN_UNMANAGED &&
    - type != IOMMU_DOMAIN_DMA &&
    - type != IOMMU_DOMAIN_IDENTITY)
    - return NULL;
    + if (type != IOMMU_DOMAIN_UNMANAGED && type != IOMMU_DOMAIN_IDENTITY) {
    + if (using_legacy_binding || type != IOMMU_DOMAIN_DMA)
    + return NULL;
    + }
    /*
    * Allocate the domain and initialise some of its data structures.
    * We can't really do anything meaningful until we've added a
    @@ -881,12 +881,6 @@ static struct iommu_domain *arm_smmu_domain_alloc(unsigned type)
    if (!smmu_domain)
    return NULL;

    - if (type == IOMMU_DOMAIN_DMA && (using_legacy_binding ||
    - iommu_get_dma_cookie(&smmu_domain->domain))) {
    - kfree(smmu_domain);
    - return NULL;
    - }
    -
    mutex_init(&smmu_domain->init_mutex);
    spin_lock_init(&smmu_domain->cb_lock);

    @@ -901,7 +895,6 @@ static void arm_smmu_domain_free(struct iommu_domain *domain)
    * Free the domain resources. We assume that all devices have
    * already been detached.
    */
    - iommu_put_dma_cookie(domain);
    arm_smmu_destroy_domain_context(domain);
    kfree(smmu_domain);
    }
    diff --git a/drivers/iommu/arm/arm-smmu/qcom_iommu.c b/drivers/iommu/arm/arm-smmu/qcom_iommu.c
    index 021cf8f65ffc..4b7eca5f5148 100644
    --- a/drivers/iommu/arm/arm-smmu/qcom_iommu.c
    +++ b/drivers/iommu/arm/arm-smmu/qcom_iommu.c
    @@ -335,12 +335,6 @@ static struct iommu_domain *qcom_iommu_domain_alloc(unsigned type)
    if (!qcom_domain)
    return NULL;

    - if (type == IOMMU_DOMAIN_DMA &&
    - iommu_get_dma_cookie(&qcom_domain->domain)) {
    - kfree(qcom_domain);
    - return NULL;
    - }
    -
    mutex_init(&qcom_domain->init_mutex);
    spin_lock_init(&qcom_domain->pgtbl_lock);

    @@ -351,8 +345,6 @@ static void qcom_iommu_domain_free(struct iommu_domain *domain)
    {
    struct qcom_iommu_domain *qcom_domain = to_qcom_iommu_domain(domain);

    - iommu_put_dma_cookie(domain);
    -
    if (qcom_domain->iommu) {
    /*
    * NOTE: unmap can be called after client device is powered
    --
    2.25.1
    \
     
     \ /
      Last update: 2021-07-28 17:59    [W:4.201 / U:0.212 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site