iommu/vt-d: Remove dmar_readl(), etc
Subsystems (2)
cover iommu/vt-d: Remove dmar_readl(), etc
Remove dmar_readl() and similar wrappers because they add nothing over readl() and are used inconsistently.
dmar_writel() and dmar_writeq() swapped the order of the address and value parameters, so I put those changes in a separate patch for ease of reviewing. I'm happy to squash them if desired.
Bjorn Helgaas (2):
iommu/vt-d: Remove dmar_readl() and dmar_readq() iommu/vt-d: Remove dmar_writel() and dmar_writeq()
drivers/iommu/intel/debugfs.c | 18 +++++------ drivers/iommu/intel/dmar.c | 24 +++++++------- drivers/iommu/intel/iommu.c | 22 ++++++------- drivers/iommu/intel/iommu.h | 5 --- drivers/iommu/intel/irq_remapping.c | 6 ++-- drivers/iommu/intel/perfmon.c | 50 ++++++++++++++--------------- drivers/iommu/intel/prq.c | 26 +++++++-------- 7 files changed, 73 insertions(+), 78 deletions(-)
Signature · 1 line
2.51.0
PATCH 1/2 iommu/vt-d: Remove dmar_readl() and dmar_readq()
dmar_readl() and dmar_readq() do nothing other than expand to the generic readl() and readq(), and the dmar_read*() wrappers are used inconsistently.
Remove the dmar_read*() wrappers and use readl() and readq() directly.
--- drivers/iommu/intel/debugfs.c | 18 +++++++++--------- drivers/iommu/intel/dmar.c | 22 +++++++++++----------- drivers/iommu/intel/iommu.c | 10 +++++----- drivers/iommu/intel/iommu.h | 2 -- drivers/iommu/intel/irq_remapping.c | 2 +- drivers/iommu/intel/perfmon.c | 28 ++++++++++++++-------------- drivers/iommu/intel/prq.c | 12 ++++++------ 7 files changed, 46 insertions(+), 48 deletions(-)
drivers/iommu/intel/debugfs.c +9 -9
@@ -133,13 +133,13 @@ static int iommu_regset_show(struct seq_file *m, void *unused)*/ raw_spin_lock_irqsave (&iommu->register_lock, flag);for (i =0 ; i <ARRAY_SIZE (iommu_regs_32); i++) { - value =dmar_readl (iommu->reg + iommu_regs_32[i].offset); + value =readl (iommu->reg + iommu_regs_32[i].offset);seq_printf (m,"%-16s\t0x%02x\t\t0x%016llx\n" , iommu_regs_32[i].regs, iommu_regs_32[i].offset, value); }for (i =0 ; i <ARRAY_SIZE (iommu_regs_64); i++) { - value =dmar_readq (iommu->reg + iommu_regs_64[i].offset); + value =readq (iommu->reg + iommu_regs_64[i].offset);seq_printf (m,"%-16s\t0x%02x\t\t0x%016llx\n" , iommu_regs_64[i].regs, iommu_regs_64[i].offset, value);
@@ -247,7 +247,7 @@ static void ctx_tbl_walk(struct seq_file *m, struct intel_iommu *iommu, u16 bus) tbl_wlk.ctx_entry = context; m->private = &tbl_wlk; -if (dmar_readq (iommu->reg +DMAR_RTADDR_REG ) &DMA_RTADDR_SMT ) { +if (readq (iommu->reg +DMAR_RTADDR_REG ) &DMA_RTADDR_SMT ) { pasid_dir_ptr = context->lo &VTD_PAGE_MASK ; pasid_dir_size =get_pasid_dir_size (context);pasid_dir_walk (m, pasid_dir_ptr, pasid_dir_size);
@@ -285,7 +285,7 @@ static int dmar_translation_struct_show(struct seq_file *m, void *unused)rcu_read_lock ();for_each_active_iommu (iommu, drhd) { - sts =dmar_readl (iommu->reg +DMAR_GSTS_REG ); + sts =readl (iommu->reg +DMAR_GSTS_REG );if (!(sts &DMA_GSTS_TES )) {seq_printf (m,"DMA Remapping is not enabled on %s\n" , iommu->name);
@@ -364,13 +364,13 @@ static int domain_translation_struct_show(struct seq_file *m,if (seg != iommu->segment)continue ; - sts =dmar_readl (iommu->reg +DMAR_GSTS_REG ); + sts =readl (iommu->reg +DMAR_GSTS_REG );if (!(sts &DMA_GSTS_TES )) {seq_printf (m,"DMA Remapping is not enabled on %s\n" , iommu->name);continue ; } -if (dmar_readq (iommu->reg +DMAR_RTADDR_REG ) &DMA_RTADDR_SMT ) +if (readq (iommu->reg +DMAR_RTADDR_REG ) &DMA_RTADDR_SMT ) scalable = true;else scalable = false;
@@ -538,8 +538,8 @@ static int invalidation_queue_show(struct seq_file *m, void *unused)raw_spin_lock_irqsave (&qi->q_lock, flags);seq_printf (m," Base: 0x%llx\tHead: %lld\tTail: %lld\n" , (u64 )virt_to_phys (qi->desc), -dmar_readq (iommu->reg +DMAR_IQH_REG ) >> shift, -dmar_readq (iommu->reg +DMAR_IQT_REG ) >> shift); +readq (iommu->reg +DMAR_IQH_REG ) >> shift, +readq (iommu->reg +DMAR_IQT_REG ) >> shift);invalidation_queue_entry_show (m, iommu);raw_spin_unlock_irqrestore (&qi->q_lock, flags);seq_putc (m,'\n' );
@@ -620,7 +620,7 @@ static int ir_translation_struct_show(struct seq_file *m, void *unused)seq_printf (m,"Remapped Interrupt supported on IOMMU: %s\n" , iommu->name); - sts =dmar_readl (iommu->reg +DMAR_GSTS_REG ); + sts =readl (iommu->reg +DMAR_GSTS_REG );if (iommu->ir_table && (sts &DMA_GSTS_IRES )) { irta =virt_to_phys (iommu->ir_table->base);seq_printf (m," IR table address:%llx\n" , irta);
drivers/iommu/intel/dmar.c +11 -11
@@ -899,8 +899,8 @@ dmar_validate_one_drhd(struct acpi_dmar_header *entry, void *arg)return -EINVAL ; } - cap =dmar_readq (addr +DMAR_CAP_REG ); - ecap =dmar_readq (addr +DMAR_ECAP_REG ); + cap =readq (addr +DMAR_CAP_REG ); + ecap =readq (addr +DMAR_ECAP_REG );if (arg)iounmap (addr);
@@ -982,8 +982,8 @@ static int map_iommu(struct intel_iommu *iommu, struct dmar_drhd_unit *drhd) goto release; } - iommu->cap =dmar_readq (iommu->reg +DMAR_CAP_REG ); - iommu->ecap =dmar_readq (iommu->reg +DMAR_ECAP_REG ); + iommu->cap =readq (iommu->reg +DMAR_CAP_REG ); + iommu->ecap =readq (iommu->reg +DMAR_ECAP_REG );if (iommu->cap == (uint64_t )-1 && iommu->ecap == (uint64_t )-1 ) { err = -EINVAL ;
@@ -1017,8 +1017,8 @@ static int map_iommu(struct intel_iommu *iommu, struct dmar_drhd_unit *drhd)int i;for (i =0 ; i <DMA_MAX_NUM_ECMDCAP ; i++) { - iommu->ecmdcap[i] =dmar_readq (iommu->reg +DMAR_ECCAP_REG + - i *DMA_ECMD_REG_STEP ); + iommu->ecmdcap[i] =readq (iommu->reg +DMAR_ECCAP_REG + + i *DMA_ECMD_REG_STEP ); } }
@@ -1239,8 +1239,8 @@ static const char *qi_type_string(u8 type)static void qi_dump_fault (struct intel_iommu *iommu,u32 fault) { -unsigned int head =dmar_readl (iommu->reg +DMAR_IQH_REG ); -u64 iqe_err =dmar_readq (iommu->reg +DMAR_IQER_REG ); +unsigned int head =readl (iommu->reg +DMAR_IQH_REG ); +u64 iqe_err =readq (iommu->reg +DMAR_IQER_REG );struct qi_desc *desc = iommu->qi->desc + head;if (fault &DMA_FSTS_IQE )
@@ -1322,7 +1322,7 @@ static int qi_check_fault(struct intel_iommu *iommu, int index, int wait_index)* SID field is valid only when the ITE field is Set in FSTS_REG * see Intel VT-d spec r4.1, section 11.4.9.9 */ - iqe_err =dmar_readq (iommu->reg +DMAR_IQER_REG ); + iqe_err =readq (iommu->reg +DMAR_IQER_REG ); ite_sid =DMAR_IQER_REG_ITESID (iqe_err);writel (DMA_FSTS_ITE , iommu->reg +DMAR_FSTS_REG );
@@ -1981,8 +1981,8 @@ irqreturn_t dmar_fault(int irq, void *dev_id) source_id =dma_frcd_source_id (data); pasid_present =dma_frcd_pasid_present (data); - guest_addr =dmar_readq (iommu->reg + reg + - fault_index *PRIMARY_FAULT_REG_LEN ); + guest_addr =readq (iommu->reg + reg + + fault_index *PRIMARY_FAULT_REG_LEN ); guest_addr =dma_frcd_page_addr (guest_addr); }
drivers/iommu/intel/iommu.c +5 -5
@@ -769,7 +769,7 @@ static void __iommu_flush_context(struct intel_iommu *iommu,/* Make sure hardware complete it */ IOMMU_WAIT_OP (iommu,DMAR_CCMD_REG , - dmar_readq, (!(val &DMA_CCMD_ICC )), val); + readq, (!(val &DMA_CCMD_ICC )), val);raw_spin_unlock_irqrestore (&iommu->register_lock, flag); }
@@ -811,7 +811,7 @@ void __iommu_flush_iotlb(struct intel_iommu *iommu, u16 did, u64 addr,/* Make sure hardware complete it */ IOMMU_WAIT_OP (iommu, tlb_offset +8 , - dmar_readq, (!(val &DMA_TLB_IVT )), val); + readq, (!(val &DMA_TLB_IVT )), val);raw_spin_unlock_irqrestore (&iommu->register_lock, flag);
@@ -1533,7 +1533,7 @@ static int copy_translation_tables(struct intel_iommu *iommu)int bus, ret;bool new_ext, ext; - rtaddr_reg =dmar_readq (iommu->reg +DMAR_RTADDR_REG ); + rtaddr_reg =readq (iommu->reg +DMAR_RTADDR_REG ); ext = !!(rtaddr_reg &DMA_RTADDR_SMT ); new_ext = !!sm_supported (iommu);
@@ -4185,7 +4185,7 @@ int ecmd_submit_sync(struct intel_iommu *iommu, u8 ecmd, u64 oa, u64 ob)raw_spin_lock_irqsave (&iommu->register_lock, flags); - res =dmar_readq (iommu->reg +DMAR_ECRSP_REG ); + res =readq (iommu->reg +DMAR_ECRSP_REG );if (res &DMA_ECMD_ECRSP_IP ) { ret = -EBUSY ; goto err;
@@ -4201,7 +4201,7 @@ int ecmd_submit_sync(struct intel_iommu *iommu, u8 ecmd, u64 oa, u64 ob)dmar_writeq (iommu->reg +DMAR_ECEO_REG , ob);dmar_writeq (iommu->reg +DMAR_ECMD_REG , ecmd | (oa <<DMA_ECMD_OA_SHIFT )); -IOMMU_WAIT_OP (iommu,DMAR_ECRSP_REG , dmar_readq, +IOMMU_WAIT_OP (iommu,DMAR_ECRSP_REG , readq, !(res &DMA_ECMD_ECRSP_IP ), res);if (res &DMA_ECMD_ECRSP_IP ) {
drivers/iommu/intel/iommu.h +0 -2
@@ -148,9 +148,7 @@#define OFFSET_STRIDE (9) -#define dmar_readq (a) readq(a)#define dmar_writeq (a,v) writeq(v,a) -#define dmar_readl (a) readl(a)#define dmar_writel (a, v) writel(v, a)#define DMAR_VER_MAJOR (v) (((v) & 0xf0) >> 4)
drivers/iommu/intel/irq_remapping.c +1 -1
@@ -422,7 +422,7 @@ static int iommu_load_old_irte(struct intel_iommu *iommu)u64 irta;/* Check whether the old ir-table has the same size as ours */ - irta =dmar_readq (iommu->reg +DMAR_IRTA_REG ); + irta =readq (iommu->reg +DMAR_IRTA_REG );if ((irta &INTR_REMAP_TABLE_REG_SIZE_MASK ) !=INTR_REMAP_TABLE_REG_SIZE )return -EINVAL ;
drivers/iommu/intel/perfmon.c +14 -14
@@ -307,7 +307,7 @@ static void iommu_pmu_event_update(struct perf_event *event) again: prev_count =local64_read (&hwc->prev_count); - new_count =dmar_readq (iommu_event_base (iommu_pmu, hwc->idx)); + new_count =readq (iommu_event_base (iommu_pmu, hwc->idx));if (local64_xchg (&hwc->prev_count, new_count) != prev_count) goto again;
@@ -340,7 +340,7 @@ static void iommu_pmu_start(struct perf_event *event, int flags) hwc->state =0 ;/* Always reprogram the period */ - count =dmar_readq (iommu_event_base (iommu_pmu, hwc->idx)); + count =readq (iommu_event_base (iommu_pmu, hwc->idx));local64_set ((&hwc->prev_count), count);/*
@@ -496,7 +496,7 @@ static void iommu_pmu_counter_overflow(struct iommu_pmu *iommu_pmu)* Two counters may be overflowed very close. Always check * whether there are more to handle. */ -while ((status =dmar_readq (iommu_pmu->overflow))) { +while ((status =readq (iommu_pmu->overflow))) {for_each_set_bit (i, (unsigned long *)&status, iommu_pmu->num_cntr) {/* * Find the assigned event of the counter.
@@ -518,7 +518,7 @@ static irqreturn_t iommu_pmu_irq_handler(int irq, void *dev_id) {struct intel_iommu *iommu = dev_id; -if (!dmar_readl (iommu->reg +DMAR_PERFINTRSTS_REG )) +if (!readl (iommu->reg +DMAR_PERFINTRSTS_REG ))return IRQ_NONE ;iommu_pmu_counter_overflow (iommu->pmu);
@@ -555,7 +555,7 @@ static int __iommu_pmu_register(struct intel_iommu *iommu)static inline void __iomem *get_perf_reg_address (struct intel_iommu *iommu,u32 offset) { -u32 off =dmar_readl (iommu->reg + offset); +u32 off =readl (iommu->reg + offset);return iommu->reg + off; }
@@ -574,7 +574,7 @@ int alloc_iommu_pmu(struct intel_iommu *iommu)if (!cap_ecmds (iommu->cap))return -ENODEV ; - perfcap =dmar_readq (iommu->reg +DMAR_PERFCAP_REG ); + perfcap =readq (iommu->reg +DMAR_PERFCAP_REG );/* The performance monitoring is not supported. */ if (!perfcap)return -ENODEV ;
@@ -617,8 +617,8 @@ int alloc_iommu_pmu(struct intel_iommu *iommu)for (i =0 ; i < iommu_pmu->num_eg; i++) {u64 pcap; - pcap =dmar_readq (iommu->reg +DMAR_PERFEVNTCAP_REG + - i *IOMMU_PMU_CAP_REGS_STEP ); + pcap =readq (iommu->reg +DMAR_PERFEVNTCAP_REG + + i *IOMMU_PMU_CAP_REGS_STEP ); iommu_pmu->evcap[i] =pecap_es (pcap); }
@@ -651,9 +651,9 @@ int alloc_iommu_pmu(struct intel_iommu *iommu)* Width. */ for (i =0 ; i < iommu_pmu->num_cntr; i++) { - cap =dmar_readl (iommu_pmu->cfg_reg + - i *IOMMU_PMU_CFG_OFFSET + -IOMMU_PMU_CFG_CNTRCAP_OFFSET ); + cap =readl (iommu_pmu->cfg_reg + + i *IOMMU_PMU_CFG_OFFSET + +IOMMU_PMU_CFG_CNTRCAP_OFFSET );if (!iommu_cntrcap_pcc (cap))continue ;
@@ -675,9 +675,9 @@ int alloc_iommu_pmu(struct intel_iommu *iommu)/* Override with per-counter event capabilities */ for (j =0 ; j <iommu_cntrcap_egcnt (cap); j++) { - cap =dmar_readl (iommu_pmu->cfg_reg + i *IOMMU_PMU_CFG_OFFSET + -IOMMU_PMU_CFG_CNTREVCAP_OFFSET + - (j *IOMMU_PMU_OFF_REGS_STEP )); + cap =readl (iommu_pmu->cfg_reg + i *IOMMU_PMU_CFG_OFFSET + +IOMMU_PMU_CFG_CNTREVCAP_OFFSET + + (j *IOMMU_PMU_OFF_REGS_STEP )); iommu_pmu->cntr_evcap[i][iommu_event_group (cap)] =iommu_event_select (cap);/* * Some events may only be supported by a specific counter.
drivers/iommu/intel/prq.c +6 -6
@@ -81,8 +81,8 @@ void intel_iommu_drain_pasid_prq(struct device *dev, u32 pasid)*/ prq_retry:reinit_completion (&iommu->prq_complete); - tail =dmar_readq (iommu->reg +DMAR_PQT_REG ) &PRQ_RING_MASK ; - head =dmar_readq (iommu->reg +DMAR_PQH_REG ) &PRQ_RING_MASK ; + tail =readq (iommu->reg +DMAR_PQT_REG ) &PRQ_RING_MASK ; + head =readq (iommu->reg +DMAR_PQH_REG ) &PRQ_RING_MASK ;while (head != tail) {struct page_req_dsc *req;
@@ -208,8 +208,8 @@ static irqreturn_t prq_event_thread(int irq, void *d)*/ writel (DMA_PRS_PPR , iommu->reg +DMAR_PRS_REG ); - tail =dmar_readq (iommu->reg +DMAR_PQT_REG ) &PRQ_RING_MASK ; - head =dmar_readq (iommu->reg +DMAR_PQH_REG ) &PRQ_RING_MASK ; + tail =readq (iommu->reg +DMAR_PQT_REG ) &PRQ_RING_MASK ; + head =readq (iommu->reg +DMAR_PQH_REG ) &PRQ_RING_MASK ; handled = (head != tail);while (head != tail) { req = &iommu->prq[head /sizeof (*req)];
@@ -268,8 +268,8 @@ static irqreturn_t prq_event_thread(int irq, void *d)if (readl (iommu->reg +DMAR_PRS_REG ) &DMA_PRS_PRO ) {pr_info_ratelimited ("IOMMU: %s: PRQ overflow detected\n" , iommu->name); - head =dmar_readq (iommu->reg +DMAR_PQH_REG ) &PRQ_RING_MASK ; - tail =dmar_readq (iommu->reg +DMAR_PQT_REG ) &PRQ_RING_MASK ; + head =readq (iommu->reg +DMAR_PQH_REG ) &PRQ_RING_MASK ; + tail =readq (iommu->reg +DMAR_PQT_REG ) &PRQ_RING_MASK ;if (head == tail) {iopf_queue_discard_partial (iommu->iopf_queue);writel (DMA_PRS_PRO , iommu->reg +DMAR_PRS_REG );
Signature · 1 line
2.51.0
Re: [PATCH v1 1/2] iommu/vt-d: Remove dmar_readl() and dmar_readq()
Quoted 368 lines · Bjorn Helgaas
dmar_readl()anddmar_readq()do nothing other than expand to the genericreadl()andreadq(), and the dmar_read*() wrappers are used inconsistently.Remove the dmar_read*() wrappers and use
readl()andreadq()directly.Signed-off-by Bjorn Helgaas <[email protected]>--- drivers/iommu/intel/debugfs.c | 18 +++++++++--------- drivers/iommu/intel/dmar.c | 22 +++++++++++----------- drivers/iommu/intel/iommu.c | 10 +++++----- drivers/iommu/intel/iommu.h | 2 -- drivers/iommu/intel/irq_remapping.c | 2 +- drivers/iommu/intel/perfmon.c | 28 ++++++++++++++-------------- drivers/iommu/intel/prq.c | 12 ++++++------ 7 files changed, 46 insertions(+), 48 deletions(-)drivers/iommu/intel/debugfs.c +9
-9@@ -133,13 +133,13 @@ static int iommu_regset_show(struct seq_file *m, void *unused)*/ raw_spin_lock_irqsave (&iommu->register_lock, flag);for (i =0 ; i <ARRAY_SIZE (iommu_regs_32); i++) { - value =dmar_readl (iommu->reg + iommu_regs_32[i].offset); + value =readl (iommu->reg + iommu_regs_32[i].offset);seq_printf (m,"%-16s\t0x%02x\t\t0x%016llx\n" , iommu_regs_32[i].regs, iommu_regs_32[i].offset, value); }for (i =0 ; i <ARRAY_SIZE (iommu_regs_64); i++) { - value =dmar_readq (iommu->reg + iommu_regs_64[i].offset); + value =readq (iommu->reg + iommu_regs_64[i].offset);seq_printf (m,"%-16s\t0x%02x\t\t0x%016llx\n" , iommu_regs_64[i].regs, iommu_regs_64[i].offset, value);@@ -247,7 +247,7 @@ static void ctx_tbl_walk(struct seq_file *m, struct intel_iommu *iommu, u16 bus) tbl_wlk.ctx_entry = context; m->private = &tbl_wlk; -if (dmar_readq (iommu->reg +DMAR_RTADDR_REG ) &DMA_RTADDR_SMT ) { +if (readq (iommu->reg +DMAR_RTADDR_REG ) &DMA_RTADDR_SMT ) { pasid_dir_ptr = context->lo &VTD_PAGE_MASK ; pasid_dir_size =get_pasid_dir_size (context);pasid_dir_walk (m, pasid_dir_ptr, pasid_dir_size);@@ -285,7 +285,7 @@ static int dmar_translation_struct_show(struct seq_file *m, void *unused)rcu_read_lock ();for_each_active_iommu (iommu, drhd) { - sts =dmar_readl (iommu->reg +DMAR_GSTS_REG ); + sts =readl (iommu->reg +DMAR_GSTS_REG );if (!(sts &DMA_GSTS_TES )) {seq_printf (m,"DMA Remapping is not enabled on %s\n" , iommu->name);@@ -364,13 +364,13 @@ static int domain_translation_struct_show(struct seq_file *m,if (seg != iommu->segment)continue ; - sts =dmar_readl (iommu->reg +DMAR_GSTS_REG ); + sts =readl (iommu->reg +DMAR_GSTS_REG );if (!(sts &DMA_GSTS_TES )) {seq_printf (m,"DMA Remapping is not enabled on %s\n" , iommu->name);continue ; } -if (dmar_readq (iommu->reg +DMAR_RTADDR_REG ) &DMA_RTADDR_SMT ) +if (readq (iommu->reg +DMAR_RTADDR_REG ) &DMA_RTADDR_SMT ) scalable = true;else scalable = false;@@ -538,8 +538,8 @@ static int invalidation_queue_show(struct seq_file *m, void *unused)raw_spin_lock_irqsave (&qi->q_lock, flags);seq_printf (m," Base: 0x%llx\tHead: %lld\tTail: %lld\n" , (u64 )virt_to_phys (qi->desc), -dmar_readq (iommu->reg +DMAR_IQH_REG ) >> shift, -dmar_readq (iommu->reg +DMAR_IQT_REG ) >> shift); +readq (iommu->reg +DMAR_IQH_REG ) >> shift, +readq (iommu->reg +DMAR_IQT_REG ) >> shift);invalidation_queue_entry_show (m, iommu);raw_spin_unlock_irqrestore (&qi->q_lock, flags);seq_putc (m,'\n' );@@ -620,7 +620,7 @@ static int ir_translation_struct_show(struct seq_file *m, void *unused)seq_printf (m,"Remapped Interrupt supported on IOMMU: %s\n" , iommu->name); - sts =dmar_readl (iommu->reg +DMAR_GSTS_REG ); + sts =readl (iommu->reg +DMAR_GSTS_REG );if (iommu->ir_table && (sts &DMA_GSTS_IRES )) { irta =virt_to_phys (iommu->ir_table->base);seq_printf (m," IR table address:%llx\n" , irta);drivers/iommu/intel/dmar.c +11
-11@@ -899,8 +899,8 @@ dmar_validate_one_drhd(struct acpi_dmar_header *entry, void *arg)return -EINVAL ; } - cap =dmar_readq (addr +DMAR_CAP_REG ); - ecap =dmar_readq (addr +DMAR_ECAP_REG ); + cap =readq (addr +DMAR_CAP_REG ); + ecap =readq (addr +DMAR_ECAP_REG );if (arg)iounmap (addr);@@ -982,8 +982,8 @@ static int map_iommu(struct intel_iommu *iommu, struct dmar_drhd_unit *drhd) goto release; } - iommu->cap =dmar_readq (iommu->reg +DMAR_CAP_REG ); - iommu->ecap =dmar_readq (iommu->reg +DMAR_ECAP_REG ); + iommu->cap =readq (iommu->reg +DMAR_CAP_REG ); + iommu->ecap =readq (iommu->reg +DMAR_ECAP_REG );if (iommu->cap == (uint64_t )-1 && iommu->ecap == (uint64_t )-1 ) { err = -EINVAL ;@@ -1017,8 +1017,8 @@ static int map_iommu(struct intel_iommu *iommu, struct dmar_drhd_unit *drhd)int i;for (i =0 ; i <DMA_MAX_NUM_ECMDCAP ; i++) { - iommu->ecmdcap[i] =dmar_readq (iommu->reg +DMAR_ECCAP_REG + - i *DMA_ECMD_REG_STEP ); + iommu->ecmdcap[i] =readq (iommu->reg +DMAR_ECCAP_REG + + i *DMA_ECMD_REG_STEP ); } }@@ -1239,8 +1239,8 @@ static const char *qi_type_string(u8 type)static void qi_dump_fault (struct intel_iommu *iommu,u32 fault) { -unsigned int head =dmar_readl (iommu->reg +DMAR_IQH_REG ); -u64 iqe_err =dmar_readq (iommu->reg +DMAR_IQER_REG ); +unsigned int head =readl (iommu->reg +DMAR_IQH_REG ); +u64 iqe_err =readq (iommu->reg +DMAR_IQER_REG );struct qi_desc *desc = iommu->qi->desc + head;if (fault &DMA_FSTS_IQE )@@ -1322,7 +1322,7 @@ static int qi_check_fault(struct intel_iommu *iommu, int index, int wait_index)* SID field is valid only when the ITE field is Set in FSTS_REG * see Intel VT-d spec r4.1, section 11.4.9.9 */ - iqe_err =dmar_readq (iommu->reg +DMAR_IQER_REG ); + iqe_err =readq (iommu->reg +DMAR_IQER_REG ); ite_sid =DMAR_IQER_REG_ITESID (iqe_err);writel (DMA_FSTS_ITE , iommu->reg +DMAR_FSTS_REG );@@ -1981,8 +1981,8 @@ irqreturn_t dmar_fault(int irq, void *dev_id) source_id =dma_frcd_source_id (data); pasid_present =dma_frcd_pasid_present (data); - guest_addr =dmar_readq (iommu->reg + reg + - fault_index *PRIMARY_FAULT_REG_LEN ); + guest_addr =readq (iommu->reg + reg + + fault_index *PRIMARY_FAULT_REG_LEN ); guest_addr =dma_frcd_page_addr (guest_addr); }drivers/iommu/intel/iommu.c +5
-5@@ -769,7 +769,7 @@ static void __iommu_flush_context(struct intel_iommu *iommu,/* Make sure hardware complete it */ IOMMU_WAIT_OP (iommu,DMAR_CCMD_REG , - dmar_readq, (!(val &DMA_CCMD_ICC )), val); + readq, (!(val &DMA_CCMD_ICC )), val);raw_spin_unlock_irqrestore (&iommu->register_lock, flag); }@@ -811,7 +811,7 @@ void __iommu_flush_iotlb(struct intel_iommu *iommu, u16 did, u64 addr,/* Make sure hardware complete it */ IOMMU_WAIT_OP (iommu, tlb_offset +8 , - dmar_readq, (!(val &DMA_TLB_IVT )), val); + readq, (!(val &DMA_TLB_IVT )), val);raw_spin_unlock_irqrestore (&iommu->register_lock, flag);@@ -1533,7 +1533,7 @@ static int copy_translation_tables(struct intel_iommu *iommu)int bus, ret;bool new_ext, ext; - rtaddr_reg =dmar_readq (iommu->reg +DMAR_RTADDR_REG ); + rtaddr_reg =readq (iommu->reg +DMAR_RTADDR_REG ); ext = !!(rtaddr_reg &DMA_RTADDR_SMT ); new_ext = !!sm_supported (iommu);@@ -4185,7 +4185,7 @@ int ecmd_submit_sync(struct intel_iommu *iommu, u8 ecmd, u64 oa, u64 ob)raw_spin_lock_irqsave (&iommu->register_lock, flags); - res =dmar_readq (iommu->reg +DMAR_ECRSP_REG ); + res =readq (iommu->reg +DMAR_ECRSP_REG );if (res &DMA_ECMD_ECRSP_IP ) { ret = -EBUSY ; goto err;@@ -4201,7 +4201,7 @@ int ecmd_submit_sync(struct intel_iommu *iommu, u8 ecmd, u64 oa, u64 ob)dmar_writeq (iommu->reg +DMAR_ECEO_REG , ob);dmar_writeq (iommu->reg +DMAR_ECMD_REG , ecmd | (oa <<DMA_ECMD_OA_SHIFT )); -IOMMU_WAIT_OP (iommu,DMAR_ECRSP_REG , dmar_readq, +IOMMU_WAIT_OP (iommu,DMAR_ECRSP_REG , readq, !(res &DMA_ECMD_ECRSP_IP ), res);if (res &DMA_ECMD_ECRSP_IP ) {drivers/iommu/intel/iommu.h +0
-2@@ -148,9 +148,7 @@#define OFFSET_STRIDE (9) -#define dmar_readq (a) readq(a)#define dmar_writeq (a,v) writeq(v,a) -#define dmar_readl (a) readl(a)#define dmar_writel (a, v) writel(v, a)#define DMAR_VER_MAJOR (v) (((v) & 0xf0) >> 4)drivers/iommu/intel/irq_remapping.c +1
-1@@ -422,7 +422,7 @@ static int iommu_load_old_irte(struct intel_iommu *iommu)u64 irta;/* Check whether the old ir-table has the same size as ours */ - irta =dmar_readq (iommu->reg +DMAR_IRTA_REG ); + irta =readq (iommu->reg +DMAR_IRTA_REG );if ((irta &INTR_REMAP_TABLE_REG_SIZE_MASK ) !=INTR_REMAP_TABLE_REG_SIZE )return -EINVAL ;drivers/iommu/intel/perfmon.c +14
-14@@ -307,7 +307,7 @@ static void iommu_pmu_event_update(struct perf_event *event) again: prev_count =local64_read (&hwc->prev_count); - new_count =dmar_readq (iommu_event_base (iommu_pmu, hwc->idx)); + new_count =readq (iommu_event_base (iommu_pmu, hwc->idx));if (local64_xchg (&hwc->prev_count, new_count) != prev_count) goto again;@@ -340,7 +340,7 @@ static void iommu_pmu_start(struct perf_event *event, int flags) hwc->state =0 ;/* Always reprogram the period */ - count =dmar_readq (iommu_event_base (iommu_pmu, hwc->idx)); + count =readq (iommu_event_base (iommu_pmu, hwc->idx));local64_set ((&hwc->prev_count), count);/* @@ -496,7 +496,7 @@ static void iommu_pmu_counter_overflow(struct iommu_pmu *iommu_pmu)* Two counters may be overflowed very close. Always check * whether there are more to handle. */ -while ((status =dmar_readq (iommu_pmu->overflow))) { +while ((status =readq (iommu_pmu->overflow))) {for_each_set_bit (i, (unsigned long *)&status, iommu_pmu->num_cntr) {/* * Find the assigned event of the counter. @@ -518,7 +518,7 @@ static irqreturn_t iommu_pmu_irq_handler(int irq, void *dev_id) {struct intel_iommu *iommu = dev_id; -if (!dmar_readl (iommu->reg +DMAR_PERFINTRSTS_REG )) +if (!readl (iommu->reg +DMAR_PERFINTRSTS_REG ))return IRQ_NONE ;iommu_pmu_counter_overflow (iommu->pmu);@@ -555,7 +555,7 @@ static int __iommu_pmu_register(struct intel_iommu *iommu)static inline void __iomem *get_perf_reg_address (struct intel_iommu *iommu,u32 offset) { -u32 off =dmar_readl (iommu->reg + offset); +u32 off =readl (iommu->reg + offset);return iommu->reg + off; }@@ -574,7 +574,7 @@ int alloc_iommu_pmu(struct intel_iommu *iommu)if (!cap_ecmds (iommu->cap))return -ENODEV ; - perfcap =dmar_readq (iommu->reg +DMAR_PERFCAP_REG ); + perfcap =readq (iommu->reg +DMAR_PERFCAP_REG );/* The performance monitoring is not supported. */ if (!perfcap)return -ENODEV ;@@ -617,8 +617,8 @@ int alloc_iommu_pmu(struct intel_iommu *iommu)for (i =0 ; i < iommu_pmu->num_eg; i++) {u64 pcap; - pcap =dmar_readq (iommu->reg +DMAR_PERFEVNTCAP_REG + - i *IOMMU_PMU_CAP_REGS_STEP ); + pcap =readq (iommu->reg +DMAR_PERFEVNTCAP_REG + + i *IOMMU_PMU_CAP_REGS_STEP ); iommu_pmu->evcap[i] =pecap_es (pcap); }@@ -651,9 +651,9 @@ int alloc_iommu_pmu(struct intel_iommu *iommu)* Width. */ for (i =0 ; i < iommu_pmu->num_cntr; i++) { - cap =dmar_readl (iommu_pmu->cfg_reg + - i *IOMMU_PMU_CFG_OFFSET + -IOMMU_PMU_CFG_CNTRCAP_OFFSET ); + cap =readl (iommu_pmu->cfg_reg + + i *IOMMU_PMU_CFG_OFFSET + +IOMMU_PMU_CFG_CNTRCAP_OFFSET );if (!iommu_cntrcap_pcc (cap))continue ;@@ -675,9 +675,9 @@ int alloc_iommu_pmu(struct intel_iommu *iommu)/* Override with per-counter event capabilities */ for (j =0 ; j <iommu_cntrcap_egcnt (cap); j++) { - cap =dmar_readl (iommu_pmu->cfg_reg + i *IOMMU_PMU_CFG_OFFSET + -IOMMU_PMU_CFG_CNTREVCAP_OFFSET + - (j *IOMMU_PMU_OFF_REGS_STEP )); + cap =readl (iommu_pmu->cfg_reg + i *IOMMU_PMU_CFG_OFFSET + +IOMMU_PMU_CFG_CNTREVCAP_OFFSET + + (j *IOMMU_PMU_OFF_REGS_STEP )); iommu_pmu->cntr_evcap[i][iommu_event_group (cap)] =iommu_event_select (cap);/* * Some events may only be supported by a specific counter. drivers/iommu/intel/prq.c +6
-7@@ -81,8 +81,8 @@ void intel_iommu_drain_pasid_prq(struct device *dev, u32 pasid)*/ prq_retry:reinit_completion (&iommu->prq_complete); - tail =dmar_readq (iommu->reg +DMAR_PQT_REG ) &PRQ_RING_MASK ; - head =dmar_readq (iommu->reg +DMAR_PQH_REG ) &PRQ_RING_MASK ; + tail =readq (iommu->reg +DMAR_PQT_REG ) &PRQ_RING_MASK ; + head =readq (iommu->reg +DMAR_PQH_REG ) &PRQ_RING_MASK ;while (head != tail) {struct page_req_dsc *req;@@ -208,8 +208,8 @@ static irqreturn_t prq_event_thread(int irq, void *d)*/ writel (DMA_PRS_PPR , iommu->reg +DMAR_PRS_REG ); - tail =dmar_readq (iommu->reg +DMAR_PQT_REG ) &PRQ_RING_MASK ; - head =dmar_readq (iommu->reg +DMAR_PQH_REG ) &PRQ_RING_MASK ; + tail =readq (iommu->reg +DMAR_PQT_REG ) &PRQ_RING_MASK ; + head =readq (iommu->reg +DMAR_PQH_REG ) &PRQ_RING_MASK ; handled = (head != tail);while (head != tail) { req = &iommu->prq[head /sizeof (*req)];@@ -268,8 +268,8 @@ static irqreturn_t prq_event_thread(int irq, void *d)if (readl (iommu->reg +DMAR_PRS_REG ) &DMA_PRS_PRO ) {pr_info_ratelimited ("IOMMU: %s: PRQ overflow detected\n" , iommu->name); - head =dmar_readq (iommu->reg +DMAR_PQH_REG ) &PRQ_RING_MASK ; - tail =dmar_readq (iommu->reg +DMAR_PQT_REG ) &PRQ_RING_MASK ; + head =readq (iommu->reg +DMAR_PQH_REG ) &PRQ_RING_MASK ; + tail =readq (iommu->reg +DMAR_PQT_REG ) &PRQ_RING_MASK ;if (head == tail) {iopf_queue_discard_partial (iommu->iopf_queue);writel (DMA_PRS_PRO , iommu->reg +DMAR_PRS_REG ); --
Quoted 3 lines
2.51.0
PATCH 2/2 iommu/vt-d: Remove dmar_writel() and dmar_writeq()
In reply to Bjorn Helgaasdmar_writel() and dmar_writeq() do nothing other than expand to the generic writel() and writeq(), and the dmar_write*() wrappers are used inconsistently.
Remove the dmar_write*() wrappers and use writel() and writeq() directly.
--- drivers/iommu/intel/dmar.c | 2 +- drivers/iommu/intel/iommu.c | 12 ++++++------ drivers/iommu/intel/iommu.h | 3 --- drivers/iommu/intel/irq_remapping.c | 4 ++-- drivers/iommu/intel/perfmon.c | 22 +++++++++++----------- drivers/iommu/intel/prq.c | 14 +++++++------- 6 files changed, 27 insertions(+), 30 deletions(-)
drivers/iommu/intel/dmar.c +1 -1
@@ -1662,7 +1662,7 @@ static void __dmar_enable_qi(struct intel_iommu *iommu)/* write zero to the tail reg */ writel (0 , iommu->reg +DMAR_IQT_REG ); -dmar_writeq (iommu->reg +DMAR_IQA_REG , val); +writeq (val, iommu->reg +DMAR_IQA_REG ); iommu->gcmd |=DMA_GCMD_QIE ;writel (iommu->gcmd, iommu->reg +DMAR_GCMD_REG );
drivers/iommu/intel/iommu.c +6 -6
@@ -697,7 +697,7 @@ static void iommu_set_root_entry(struct intel_iommu *iommu) addr |=DMA_RTADDR_SMT ;raw_spin_lock_irqsave (&iommu->register_lock, flag); -dmar_writeq (iommu->reg +DMAR_RTADDR_REG , addr); +writeq (addr, iommu->reg +DMAR_RTADDR_REG );writel (iommu->gcmd |DMA_GCMD_SRTP , iommu->reg +DMAR_GCMD_REG );
@@ -765,7 +765,7 @@ static void __iommu_flush_context(struct intel_iommu *iommu, val |=DMA_CCMD_ICC ;raw_spin_lock_irqsave (&iommu->register_lock, flag); -dmar_writeq (iommu->reg +DMAR_CCMD_REG , val); +writeq (val, iommu->reg +DMAR_CCMD_REG );/* Make sure hardware complete it */ IOMMU_WAIT_OP(iommu, DMAR_CCMD_REG,
@@ -806,8 +806,8 @@ void __iommu_flush_iotlb(struct intel_iommu *iommu, u16 did, u64 addr,raw_spin_lock_irqsave (&iommu->register_lock, flag);/* Note: Only uses first TLB reg currently */ if (val_iva) -dmar_writeq (iommu->reg + tlb_offset, val_iva); -dmar_writeq (iommu->reg + tlb_offset +8 , val); +writeq (val_iva, iommu->reg + tlb_offset); +writeq (val, iommu->reg + tlb_offset +8 );/* Make sure hardware complete it */ IOMMU_WAIT_OP(iommu, tlb_offset + 8,
@@ -4198,8 +4198,8 @@ int ecmd_submit_sync(struct intel_iommu *iommu, u8 ecmd, u64 oa, u64 ob)* - It's not invoked in any critical path. The extra MMIO * write doesn't bring any performance concerns. */ -dmar_writeq (iommu->reg +DMAR_ECEO_REG , ob); -dmar_writeq (iommu->reg +DMAR_ECMD_REG , ecmd | (oa <<DMA_ECMD_OA_SHIFT )); +writeq (ob, iommu->reg +DMAR_ECEO_REG ); +writeq (ecmd | (oa <<DMA_ECMD_OA_SHIFT ), iommu->reg +DMAR_ECMD_REG );IOMMU_WAIT_OP (iommu,DMAR_ECRSP_REG , readq, !(res &DMA_ECMD_ECRSP_IP ), res);
drivers/iommu/intel/iommu.h +0 -3
@@ -148,9 +148,6 @@#define OFFSET_STRIDE (9) -#define dmar_writeq (a,v) writeq(v,a) -#define dmar_writel (a, v) writel(v, a) -#define DMAR_VER_MAJOR (v) (((v) & 0xf0) >> 4)#define DMAR_VER_MINOR (v) ((v) & 0x0f)
drivers/iommu/intel/irq_remapping.c +2 -2
@@ -465,8 +465,8 @@ static void iommu_set_irq_remapping(struct intel_iommu *iommu, int mode)raw_spin_lock_irqsave (&iommu->register_lock, flags); -dmar_writeq (iommu->reg +DMAR_IRTA_REG , - (addr) |IR_X2APIC_MODE (mode) |INTR_REMAP_TABLE_REG_SIZE ); +writeq ((addr) |IR_X2APIC_MODE (mode) |INTR_REMAP_TABLE_REG_SIZE , + iommu->reg +DMAR_IRTA_REG );/* Set interrupt-remapping table pointer */ writel (iommu->gcmd |DMA_GCMD_SIRTP , iommu->reg +DMAR_GCMD_REG );
drivers/iommu/intel/perfmon.c +11 -11
@@ -99,20 +99,20 @@ IOMMU_PMU_ATTR(filter_page_table, "config2:32-36", IOMMU_PMU_FILTER_PAGE_TABLE);#define iommu_pmu_set_filter (_name, _config, _filter, _idx, _econfig) \ { \ if ((iommu_pmu->filter & _filter) && iommu_pmu_en_##_name(_econfig)) { \ - dmar_writel(iommu_pmu->cfg_reg + _idx * IOMMU_PMU_CFG_OFFSET + \ - IOMMU_PMU_CFG_SIZE + \ - (ffs(_filter) - 1) * IOMMU_PMU_CFG_FILTERS_OFFSET, \ - iommu_pmu_get_##_name(_config) | IOMMU_PMU_FILTER_EN);\ + writel(iommu_pmu_get_##_name(_config) | IOMMU_PMU_FILTER_EN, \ + iommu_pmu->cfg_reg + _idx * IOMMU_PMU_CFG_OFFSET + \ + IOMMU_PMU_CFG_SIZE + \ + (ffs(_filter) - 1) * IOMMU_PMU_CFG_FILTERS_OFFSET); \ } \ }#define iommu_pmu_clear_filter (_filter, _idx) \ { \ if (iommu_pmu->filter & _filter) { \ - dmar_writel(iommu_pmu->cfg_reg + _idx * IOMMU_PMU_CFG_OFFSET + \ - IOMMU_PMU_CFG_SIZE + \ - (ffs(_filter) - 1) * IOMMU_PMU_CFG_FILTERS_OFFSET, \ - 0); \ + writel(0, \ + iommu_pmu->cfg_reg + _idx * IOMMU_PMU_CFG_OFFSET + \ + IOMMU_PMU_CFG_SIZE + \ + (ffs(_filter) - 1) * IOMMU_PMU_CFG_FILTERS_OFFSET); \ } \ }
@@ -411,7 +411,7 @@ static int iommu_pmu_assign_event(struct iommu_pmu *iommu_pmu, hwc->idx = idx;/* config events */ -dmar_writeq (iommu_config_base (iommu_pmu, idx), hwc->config); +writeq (hwc->config,iommu_config_base (iommu_pmu, idx)); iommu_pmu_set_filter(requester_id, event->attr.config1, IOMMU_PMU_FILTER_REQUESTER_ID, idx,
@@ -510,7 +510,7 @@ static void iommu_pmu_counter_overflow(struct iommu_pmu *iommu_pmu)iommu_pmu_event_update (event); } -dmar_writeq (iommu_pmu->overflow, status); +writeq (status, iommu_pmu->overflow); } }
@@ -524,7 +524,7 @@ static irqreturn_t iommu_pmu_irq_handler(int irq, void *dev_id)iommu_pmu_counter_overflow (iommu->pmu);/* Clear the status bit */ -dmar_writel (iommu->reg +DMAR_PERFINTRSTS_REG ,DMA_PERFINTRSTS_PIS ); +writel (DMA_PERFINTRSTS_PIS , iommu->reg +DMAR_PERFINTRSTS_REG );return IRQ_HANDLED ; }
drivers/iommu/intel/prq.c +7 -7
@@ -259,7 +259,7 @@ static irqreturn_t prq_event_thread(int irq, void *d) head = (head +sizeof (*req)) &PRQ_RING_MASK ; } -dmar_writeq (iommu->reg +DMAR_PQH_REG , tail); +writeq (tail, iommu->reg +DMAR_PQH_REG );/* * Clear the page request overflow bit and wake up all threads that
@@ -325,9 +325,9 @@ int intel_iommu_enable_prq(struct intel_iommu *iommu) iommu->name); goto free_iopfq; } -dmar_writeq (iommu->reg +DMAR_PQH_REG ,0ULL ); -dmar_writeq (iommu->reg +DMAR_PQT_REG ,0ULL ); -dmar_writeq (iommu->reg +DMAR_PQA_REG ,virt_to_phys (iommu->prq) |PRQ_ORDER ); +writeq (0ULL , iommu->reg +DMAR_PQH_REG ); +writeq (0ULL , iommu->reg +DMAR_PQT_REG ); +writeq (virt_to_phys (iommu->prq) |PRQ_ORDER , iommu->reg +DMAR_PQA_REG );init_completion (&iommu->prq_complete);
@@ -348,9 +348,9 @@ int intel_iommu_enable_prq(struct intel_iommu *iommu)int intel_iommu_finish_prq (struct intel_iommu *iommu) { -dmar_writeq (iommu->reg +DMAR_PQH_REG ,0ULL ); -dmar_writeq (iommu->reg +DMAR_PQT_REG ,0ULL ); -dmar_writeq (iommu->reg +DMAR_PQA_REG ,0ULL ); +writeq (0ULL , iommu->reg +DMAR_PQH_REG ); +writeq (0ULL , iommu->reg +DMAR_PQT_REG ); +writeq (0ULL , iommu->reg +DMAR_PQA_REG );if (iommu->pr_irq) {free_irq (iommu->pr_irq, iommu);
Signature · 1 line
2.51.0
Re: [PATCH v1 2/2] iommu/vt-d: Remove dmar_writel() and dmar_writeq()
Quoted 203 lines · Bjorn Helgaas
dmar_writel()anddmar_writeq()do nothing other than expand to the genericwritel()andwriteq(), and the dmar_write*() wrappers are used inconsistently.Remove the dmar_write*() wrappers and use
writel()andwriteq()directly.Signed-off-by Bjorn Helgaas <[email protected]>--- drivers/iommu/intel/dmar.c | 2 +- drivers/iommu/intel/iommu.c | 12 ++++++------ drivers/iommu/intel/iommu.h | 3 --- drivers/iommu/intel/irq_remapping.c | 4 ++-- drivers/iommu/intel/perfmon.c | 22 +++++++++++----------- drivers/iommu/intel/prq.c | 14 +++++++------- 6 files changed, 27 insertions(+), 30 deletions(-)drivers/iommu/intel/dmar.c +1
-1@@ -1662,7 +1662,7 @@ static void __dmar_enable_qi(struct intel_iommu *iommu)/* write zero to the tail reg */ writel (0 , iommu->reg +DMAR_IQT_REG ); -dmar_writeq (iommu->reg +DMAR_IQA_REG , val); +writeq (val, iommu->reg +DMAR_IQA_REG ); iommu->gcmd |=DMA_GCMD_QIE ;writel (iommu->gcmd, iommu->reg +DMAR_GCMD_REG );drivers/iommu/intel/iommu.c +6
-6@@ -697,7 +697,7 @@ static void iommu_set_root_entry(struct intel_iommu *iommu) addr |=DMA_RTADDR_SMT ;raw_spin_lock_irqsave (&iommu->register_lock, flag); -dmar_writeq (iommu->reg +DMAR_RTADDR_REG , addr); +writeq (addr, iommu->reg +DMAR_RTADDR_REG );writel (iommu->gcmd |DMA_GCMD_SRTP , iommu->reg +DMAR_GCMD_REG );@@ -765,7 +765,7 @@ static void __iommu_flush_context(struct intel_iommu *iommu, val |=DMA_CCMD_ICC ;raw_spin_lock_irqsave (&iommu->register_lock, flag); -dmar_writeq (iommu->reg +DMAR_CCMD_REG , val); +writeq (val, iommu->reg +DMAR_CCMD_REG );/* Make sure hardware complete it */ IOMMU_WAIT_OP(iommu, DMAR_CCMD_REG,@@ -806,8 +806,8 @@ void __iommu_flush_iotlb(struct intel_iommu *iommu, u16 did, u64 addr,raw_spin_lock_irqsave (&iommu->register_lock, flag);/* Note: Only uses first TLB reg currently */ if (val_iva) -dmar_writeq (iommu->reg + tlb_offset, val_iva); -dmar_writeq (iommu->reg + tlb_offset +8 , val); +writeq (val_iva, iommu->reg + tlb_offset); +writeq (val, iommu->reg + tlb_offset +8 );/* Make sure hardware complete it */ IOMMU_WAIT_OP(iommu, tlb_offset + 8,@@ -4198,8 +4198,8 @@ int ecmd_submit_sync(struct intel_iommu *iommu, u8 ecmd, u64 oa, u64 ob)* - It's not invoked in any critical path. The extra MMIO * write doesn't bring any performance concerns. */ -dmar_writeq (iommu->reg +DMAR_ECEO_REG , ob); -dmar_writeq (iommu->reg +DMAR_ECMD_REG , ecmd | (oa <<DMA_ECMD_OA_SHIFT )); +writeq (ob, iommu->reg +DMAR_ECEO_REG ); +writeq (ecmd | (oa <<DMA_ECMD_OA_SHIFT ), iommu->reg +DMAR_ECMD_REG );IOMMU_WAIT_OP (iommu,DMAR_ECRSP_REG , readq, !(res &DMA_ECMD_ECRSP_IP ), res);drivers/iommu/intel/iommu.h +0
-3@@ -148,9 +148,6 @@#define OFFSET_STRIDE (9) -#define dmar_writeq (a,v) writeq(v,a) -#define dmar_writel (a, v) writel(v, a) -#define DMAR_VER_MAJOR (v) (((v) & 0xf0) >> 4)#define DMAR_VER_MINOR (v) ((v) & 0x0f)drivers/iommu/intel/irq_remapping.c +2
-2@@ -465,8 +465,8 @@ static void iommu_set_irq_remapping(struct intel_iommu *iommu, int mode)raw_spin_lock_irqsave (&iommu->register_lock, flags); -dmar_writeq (iommu->reg +DMAR_IRTA_REG , - (addr) |IR_X2APIC_MODE (mode) |INTR_REMAP_TABLE_REG_SIZE ); +writeq ((addr) |IR_X2APIC_MODE (mode) |INTR_REMAP_TABLE_REG_SIZE , + iommu->reg +DMAR_IRTA_REG );/* Set interrupt-remapping table pointer */ writel (iommu->gcmd |DMA_GCMD_SIRTP , iommu->reg +DMAR_GCMD_REG );drivers/iommu/intel/perfmon.c +11
-11@@ -99,20 +99,20 @@ IOMMU_PMU_ATTR(filter_page_table, "config2:32-36", IOMMU_PMU_FILTER_PAGE_TABLE);#define iommu_pmu_set_filter (_name, _config, _filter, _idx, _econfig) \ { \ if ((iommu_pmu->filter & _filter) && iommu_pmu_en_##_name(_econfig)) { \ - dmar_writel(iommu_pmu->cfg_reg + _idx * IOMMU_PMU_CFG_OFFSET + \ - IOMMU_PMU_CFG_SIZE + \ - (ffs(_filter) - 1) * IOMMU_PMU_CFG_FILTERS_OFFSET, \ - iommu_pmu_get_##_name(_config) | IOMMU_PMU_FILTER_EN);\ + writel(iommu_pmu_get_##_name(_config) | IOMMU_PMU_FILTER_EN, \ + iommu_pmu->cfg_reg + _idx * IOMMU_PMU_CFG_OFFSET + \ + IOMMU_PMU_CFG_SIZE + \ + (ffs(_filter) - 1) * IOMMU_PMU_CFG_FILTERS_OFFSET); \ } \ }#define iommu_pmu_clear_filter (_filter, _idx) \ { \ if (iommu_pmu->filter & _filter) { \ - dmar_writel(iommu_pmu->cfg_reg + _idx * IOMMU_PMU_CFG_OFFSET + \ - IOMMU_PMU_CFG_SIZE + \ - (ffs(_filter) - 1) * IOMMU_PMU_CFG_FILTERS_OFFSET, \ - 0); \ + writel(0, \ + iommu_pmu->cfg_reg + _idx * IOMMU_PMU_CFG_OFFSET + \ + IOMMU_PMU_CFG_SIZE + \ + (ffs(_filter) - 1) * IOMMU_PMU_CFG_FILTERS_OFFSET); \ } \ }@@ -411,7 +411,7 @@ static int iommu_pmu_assign_event(struct iommu_pmu *iommu_pmu, hwc->idx = idx;/* config events */ -dmar_writeq (iommu_config_base (iommu_pmu, idx), hwc->config); +writeq (hwc->config,iommu_config_base (iommu_pmu, idx)); iommu_pmu_set_filter(requester_id, event->attr.config1, IOMMU_PMU_FILTER_REQUESTER_ID, idx,@@ -510,7 +510,7 @@ static void iommu_pmu_counter_overflow(struct iommu_pmu *iommu_pmu)iommu_pmu_event_update (event); } -dmar_writeq (iommu_pmu->overflow, status); +writeq (status, iommu_pmu->overflow); } }@@ -524,7 +524,7 @@ static irqreturn_t iommu_pmu_irq_handler(int irq, void *dev_id)iommu_pmu_counter_overflow (iommu->pmu);/* Clear the status bit */ -dmar_writel (iommu->reg +DMAR_PERFINTRSTS_REG ,DMA_PERFINTRSTS_PIS ); +writel (DMA_PERFINTRSTS_PIS , iommu->reg +DMAR_PERFINTRSTS_REG );return IRQ_HANDLED ; }drivers/iommu/intel/prq.c +7
-8@@ -259,7 +259,7 @@ static irqreturn_t prq_event_thread(int irq, void *d) head = (head +sizeof (*req)) &PRQ_RING_MASK ; } -dmar_writeq (iommu->reg +DMAR_PQH_REG , tail); +writeq (tail, iommu->reg +DMAR_PQH_REG );/* * Clear the page request overflow bit and wake up all threads that @@ -325,9 +325,9 @@ int intel_iommu_enable_prq(struct intel_iommu *iommu) iommu->name); goto free_iopfq; } -dmar_writeq (iommu->reg +DMAR_PQH_REG ,0ULL ); -dmar_writeq (iommu->reg +DMAR_PQT_REG ,0ULL ); -dmar_writeq (iommu->reg +DMAR_PQA_REG ,virt_to_phys (iommu->prq) |PRQ_ORDER ); +writeq (0ULL , iommu->reg +DMAR_PQH_REG ); +writeq (0ULL , iommu->reg +DMAR_PQT_REG ); +writeq (virt_to_phys (iommu->prq) |PRQ_ORDER , iommu->reg +DMAR_PQA_REG );init_completion (&iommu->prq_complete);@@ -348,9 +348,9 @@ int intel_iommu_enable_prq(struct intel_iommu *iommu)int intel_iommu_finish_prq (struct intel_iommu *iommu) { -dmar_writeq (iommu->reg +DMAR_PQH_REG ,0ULL ); -dmar_writeq (iommu->reg +DMAR_PQT_REG ,0ULL ); -dmar_writeq (iommu->reg +DMAR_PQA_REG ,0ULL ); +writeq (0ULL , iommu->reg +DMAR_PQH_REG ); +writeq (0ULL , iommu->reg +DMAR_PQT_REG ); +writeq (0ULL , iommu->reg +DMAR_PQA_REG );if (iommu->pr_irq) {free_irq (iommu->pr_irq, iommu); --
Quoted 3 lines
2.51.0
Baolu Lu
maintainerQuoted 10 lines · Bjorn Helgaas
Remove
dmar_readl()and similar wrappers because they add nothing overreadl()and are used inconsistently.
dmar_writel()anddmar_writeq()swapped the order of the address and value parameters, so I put those changes in a separate patch for ease of reviewing. I'm happy to squash them if desired.Bjorn Helgaas (2):
iommu/vt-d: Removedmar_readl()anddmar_readq()iommu/vt-d: Removedmar_writel()anddmar_writeq()
Queued for iommu/next.
Thanks,
baolu