From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933768AbeAXNUI (ORCPT ); Wed, 24 Jan 2018 08:20:08 -0500 Received: from mail-wm0-f67.google.com ([74.125.82.67]:40651 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933462AbeAXNUD (ORCPT ); Wed, 24 Jan 2018 08:20:03 -0500 X-Google-Smtp-Source: AH8x225n343iQVIQchrcm3REej8h3xKlgXkLHStIH6Y3WcqdTD7FndkcQrIs7EKVdqUBwThTJWAZeA== From: Dmitry Safonov To: linux-kernel@vger.kernel.org Cc: 0x7f454c46@gmail.com, Dmitry Safonov , Alex Williamson , David Woodhouse , Ingo Molnar , Joerg Roedel , Lu Baolu , iommu@lists.linux-foundation.org Subject: [PATCH 3/5] iommu/intel: Introduce clear_primary_faults() helper Date: Wed, 24 Jan 2018 13:19:55 +0000 Message-Id: <20180124131957.9549-4-dima@arista.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20180124131957.9549-1-dima@arista.com> References: <20180124131957.9549-1-dima@arista.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org To my mind it's a bit more readable - and I will re-use it in the next patch. Signed-off-by: Dmitry Safonov --- drivers/iommu/dmar.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/drivers/iommu/dmar.c b/drivers/iommu/dmar.c index accf58388bdb..33fb4244e438 100644 --- a/drivers/iommu/dmar.c +++ b/drivers/iommu/dmar.c @@ -1611,6 +1611,15 @@ static int dmar_fault_do_one(struct intel_iommu *iommu, int type, return 0; } +static void clear_primary_faults(struct intel_iommu *iommu) +{ + volatile void __iomem *fsts = iommu->reg + DMAR_FSTS_REG; + + assert_raw_spin_locked(&iommu->register_lock); + + writel(DMA_FSTS_PFO | DMA_FSTS_PPF | DMA_FSTS_PRO, fsts); +} + #define PRIMARY_FAULT_REG_LEN (16) irqreturn_t dmar_fault(int irq, void *dev_id) { @@ -1679,8 +1688,7 @@ irqreturn_t dmar_fault(int irq, void *dev_id) raw_spin_lock_irqsave(&iommu->register_lock, flag); } - writel(DMA_FSTS_PFO | DMA_FSTS_PPF | DMA_FSTS_PRO, - iommu->reg + DMAR_FSTS_REG); + clear_primary_faults(iommu); unlock_exit: raw_spin_unlock_irqrestore(&iommu->register_lock, flag); -- 2.13.6