From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 96781C433DF for ; Mon, 17 Aug 2020 23:41:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 697992072E for ; Mon, 17 Aug 2020 23:41:32 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ip5e87uT" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726795AbgHQXl2 (ORCPT ); Mon, 17 Aug 2020 19:41:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54022 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726707AbgHQXlS (ORCPT ); Mon, 17 Aug 2020 19:41:18 -0400 Received: from mail-qt1-x842.google.com (mail-qt1-x842.google.com [IPv6:2607:f8b0:4864:20::842]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BD378C061342 for ; Mon, 17 Aug 2020 16:41:17 -0700 (PDT) Received: by mail-qt1-x842.google.com with SMTP id t23so13860421qto.3 for ; Mon, 17 Aug 2020 16:41:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Bt5dSumf7fQqfy+NC/7uAZCPhM5E07Z6kjHuc5sIsVM=; b=ip5e87uTCRBONfOGHdHJtLQ4xjOlyN0lrHW1cGtFqHdIZUQW/Fl3+AHcHqlpqsBqgg Vc7pmOXKlkYbDxbblBhqmMk8qFXDv1c/uOrwlTK114uijA+T+K9RnFe7/lZnB+kDziSL 4NMRSHzhYMQA2Z5f0aUaDtZkVXQcdWUPa7dVtmEC80wk1J3YFeLBLAPmPPqYvtaNbsr4 hYxnDD8avYh+Uu/foj5JecanBFWC9CvOERDc1CbFaYKt13by3/7iFjUxNjE9M5OI9HVq 2jhDMnnDwms3cWsrJafiAvhfz3TVE9Kf9bqvB7AgHj6W4DzvkjwgF0yC6A0EyfRfTnz5 1GuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Bt5dSumf7fQqfy+NC/7uAZCPhM5E07Z6kjHuc5sIsVM=; b=nb7Svx97yaZbKy7ZMtz8qksQS7jvd2lm1ea3+9MptQD7/t1VrIBB9Wyqi7ADhM9WlM 2b/mLz3NKgXdBlluFw4SsMAKSBqRbUA2jtk+Y+KAuHzTdSUADHA47/4UiALoeVw3qcsN UrbbzSMbZsLeaGy/3aEz5+EusyN0Knrdg7hdvAyCJiUnkauM3yVEA4swBUxvFjuRKT/U y9NB/7BAF3glmBTF0ff5CPVZxMdxMb+7BkZ83cRvU81Vn5LZyMtasl86KrblNSylMCl6 4ZyuBhVs7tkJiZlUnsTcPO6e1jyhQ3IrhzlapMvKBH1SXEV797eL86IdM/keFmfvkvu+ 0KQw== X-Gm-Message-State: AOAM533QC5FqwhSZsZEBHomuq5DiqremdlvSMlg7UCV2Ev5MBDcob0Tn MAebZ+4GwUY9txBcwyNLMO0= X-Google-Smtp-Source: ABdhPJyd4qd5FkMrNMA213v9PdS2NirSn8aLvUjDAn2RrBNdJZtZSITLsm0p33/sSCZ9Y+3mArw5Hg== X-Received: by 2002:ac8:478e:: with SMTP id k14mr15701534qtq.21.1597707677040; Mon, 17 Aug 2020 16:41:17 -0700 (PDT) Received: from LeoBras.ibmuc.com ([177.35.193.93]) by smtp.gmail.com with ESMTPSA id w58sm22342868qth.95.2020.08.17.16.41.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 16:41:16 -0700 (PDT) From: Leonardo Bras To: Michael Ellerman , Benjamin Herrenschmidt , Paul Mackerras , Alexey Kardashevskiy , Christophe Leroy , Leonardo Bras , Joel Stanley , Thiago Jung Bauermann , Ram Pai , Brian King , Murilo Fossa Vicentini , David Dai Cc: linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org Subject: [PATCH v1 06/10] powerpc/pseries/iommu: Add ddw_list_add() helper Date: Mon, 17 Aug 2020 20:40:29 -0300 Message-Id: <20200817234033.442511-7-leobras.c@gmail.com> X-Mailer: git-send-email 2.25.4 In-Reply-To: <20200817234033.442511-1-leobras.c@gmail.com> References: <20200817234033.442511-1-leobras.c@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org There are two functions adding DDW to the direct_window_list in a similar way, so create a ddw_list_add() to avoid duplicity and simplify those functions. Also, on enable_ddw(), add list_del() on out_free_window to allow removing the window from list if any error occurs. Signed-off-by: Leonardo Bras --- arch/powerpc/platforms/pseries/iommu.c | 42 ++++++++++++++++---------- 1 file changed, 26 insertions(+), 16 deletions(-) diff --git a/arch/powerpc/platforms/pseries/iommu.c b/arch/powerpc/platforms/pseries/iommu.c index 39617ce0ec83..fcdefcc0f365 100644 --- a/arch/powerpc/platforms/pseries/iommu.c +++ b/arch/powerpc/platforms/pseries/iommu.c @@ -872,6 +872,24 @@ static u64 find_existing_ddw(struct device_node *pdn) return dma_addr; } +static struct direct_window *ddw_list_add(struct device_node *pdn, + const struct dynamic_dma_window_prop *dma64) +{ + struct direct_window *window; + + window = kzalloc(sizeof(*window), GFP_KERNEL); + if (!window) + return NULL; + + window->device = pdn; + window->prop = dma64; + spin_lock(&direct_window_list_lock); + list_add(&window->list, &direct_window_list); + spin_unlock(&direct_window_list_lock); + + return window; +} + static int find_existing_ddw_windows(void) { int len; @@ -887,18 +905,11 @@ static int find_existing_ddw_windows(void) if (!direct64) continue; - window = kzalloc(sizeof(*window), GFP_KERNEL); - if (!window || len < sizeof(struct dynamic_dma_window_prop)) { + window = ddw_list_add(pdn, direct64); + if (!window || len < sizeof(*direct64)) { kfree(window); remove_ddw(pdn, true); - continue; } - - window->device = pdn; - window->prop = direct64; - spin_lock(&direct_window_list_lock); - list_add(&window->list, &direct_window_list); - spin_unlock(&direct_window_list_lock); } return 0; @@ -1261,7 +1272,8 @@ static u64 enable_ddw(struct pci_dev *dev, struct device_node *pdn) dev_dbg(&dev->dev, "created tce table LIOBN 0x%x for %pOF\n", create.liobn, dn); - window = kzalloc(sizeof(*window), GFP_KERNEL); + /* Add new window to existing DDW list */ + window = ddw_list_add(pdn, ddwprop); if (!window) goto out_clear_window; @@ -1280,16 +1292,14 @@ static u64 enable_ddw(struct pci_dev *dev, struct device_node *pdn) goto out_free_window; } - window->device = pdn; - window->prop = ddwprop; - spin_lock(&direct_window_list_lock); - list_add(&window->list, &direct_window_list); - spin_unlock(&direct_window_list_lock); - dma_addr = be64_to_cpu(ddwprop->dma_base); goto out_unlock; out_free_window: + spin_lock(&direct_window_list_lock); + list_del(&window->list); + spin_unlock(&direct_window_list_lock); + kfree(window); out_clear_window: -- 2.25.4