From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dmitry Safonov via iommu Subject: [PATCHv2 5/6] iommu/intel: Rename dmar_fault() => dmar_serve_faults() Date: Mon, 12 Feb 2018 16:48:24 +0000 Message-ID: <20180212164825.22421-6-dima@arista.com> References: <20180212164825.22421-1-dima@arista.com> Reply-To: Dmitry Safonov Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <20180212164825.22421-1-dima-nzgTgzXrdUbQT0dZR+AlfA@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: iommu-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org Errors-To: iommu-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org To: linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Cc: Dmitry Safonov , 0x7f454c46-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org, iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org, David Woodhouse , Ingo Molnar List-Id: iommu@lists.linux-foundation.org Fix the return value, parameters and a bit better naming. Signed-off-by: Dmitry Safonov --- drivers/iommu/dmar.c | 8 +++----- drivers/iommu/intel-iommu.c | 2 +- drivers/iommu/intel_irq_remapping.c | 2 +- include/linux/dmar.h | 2 +- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/drivers/iommu/dmar.c b/drivers/iommu/dmar.c index 34a53aeede38..37a1147a7592 100644 --- a/drivers/iommu/dmar.c +++ b/drivers/iommu/dmar.c @@ -1635,9 +1635,8 @@ static void clear_primary_faults(struct intel_iommu *iommu) } #define PRIMARY_FAULT_REG_LEN (16) -irqreturn_t dmar_fault(int irq, void *dev_id) +void dmar_serve_faults(struct intel_iommu *iommu) { - struct intel_iommu *iommu = dev_id; int reg, fault_index; u32 fault_status; unsigned long flag; @@ -1706,14 +1705,13 @@ irqreturn_t dmar_fault(int irq, void *dev_id) unlock_exit: raw_spin_unlock_irqrestore(&iommu->register_lock, flag); - return IRQ_HANDLED; } static void dmar_fault_work(struct work_struct *work) { struct fault *fault = container_of(work, struct fault, work); - dmar_fault(-1, (void*)fault->iommu); + dmar_serve_faults(fault->iommu); } static irqreturn_t dmar_fault_handler(int irq, void *dev_id) @@ -1786,7 +1784,7 @@ int __init enable_drhd_fault_handling(void) /* * Clear any previous faults. */ - dmar_fault(iommu->irq, iommu); + dmar_serve_faults(iommu); fault_status = readl(iommu->reg + DMAR_FSTS_REG); writel(fault_status, iommu->reg + DMAR_FSTS_REG); } diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c index 64ad9786f5b9..3b55376b3b46 100644 --- a/drivers/iommu/intel-iommu.c +++ b/drivers/iommu/intel-iommu.c @@ -3015,7 +3015,7 @@ static void intel_iommu_init_qi(struct intel_iommu *iommu) /* * Clear any previous faults. */ - dmar_fault(-1, iommu); + dmar_serve_faults(iommu); /* * Disable queued invalidation if supported and already enabled * before OS handover. diff --git a/drivers/iommu/intel_irq_remapping.c b/drivers/iommu/intel_irq_remapping.c index 66f69af2c219..0958fdc76564 100644 --- a/drivers/iommu/intel_irq_remapping.c +++ b/drivers/iommu/intel_irq_remapping.c @@ -558,7 +558,7 @@ static int intel_setup_irq_remapping(struct intel_iommu *iommu) /* * Clear previous faults. */ - dmar_fault(-1, iommu); + dmar_serve_faults(iommu); dmar_disable_qi(iommu); if (dmar_enable_qi(iommu)) { diff --git a/include/linux/dmar.h b/include/linux/dmar.h index 5de4932a6ad8..6e9a5e4ac73a 100644 --- a/include/linux/dmar.h +++ b/include/linux/dmar.h @@ -280,7 +280,7 @@ extern void dmar_msi_mask(struct irq_data *data); extern void dmar_msi_read(int irq, struct msi_msg *msg); extern void dmar_msi_write(int irq, struct msi_msg *msg); extern int dmar_set_interrupt(struct intel_iommu *iommu); -extern irqreturn_t dmar_fault(int irq, void *dev_id); +extern void dmar_serve_faults(struct intel_iommu *iommu); extern int dmar_alloc_hwirq(int id, int node, void *arg); extern void dmar_free_hwirq(int irq); -- 2.13.6