| Message ID | 20220210092815.45174-1-jasowang@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/2] intel-iommu: remove VTD_FR_RESERVED_ERR | expand |
On Thu, Feb 10, 2022 at 05:28:14PM +0800, Jason Wang wrote: > This fault reason is not used and is duplicated with SPT.2 condition > code. So let's remove it. > > Signed-off-by: Jason Wang <jasowang@redhat.com> Reviewed-by: Peter Xu <peterx@redhat.com>
HI Michael: Want to take this series? Thanks On Thu, Feb 10, 2022 at 5:28 PM Jason Wang <jasowang@redhat.com> wrote: > > This fault reason is not used and is duplicated with SPT.2 condition > code. So let's remove it. > > Signed-off-by: Jason Wang <jasowang@redhat.com> > --- > hw/i386/intel_iommu.c | 6 ------ > hw/i386/intel_iommu_internal.h | 5 ----- > 2 files changed, 11 deletions(-) > > diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c > index 5b865ac08c..55281ee1b4 100644 > --- a/hw/i386/intel_iommu.c > +++ b/hw/i386/intel_iommu.c > @@ -469,11 +469,6 @@ static void vtd_report_dmar_fault(IntelIOMMUState *s, uint16_t source_id, > > assert(fault < VTD_FR_MAX); > > - if (fault == VTD_FR_RESERVED_ERR) { > - /* This is not a normal fault reason case. Drop it. */ > - return; > - } > - > trace_vtd_dmar_fault(source_id, fault, addr, is_write); > > if (fsts_reg & VTD_FSTS_PFO) { > @@ -1629,7 +1624,6 @@ static const bool vtd_qualified_faults[] = { > [VTD_FR_PAGING_ENTRY_RSVD] = true, > [VTD_FR_CONTEXT_ENTRY_TT] = true, > [VTD_FR_PASID_TABLE_INV] = false, > - [VTD_FR_RESERVED_ERR] = false, > [VTD_FR_MAX] = false, > }; > > diff --git a/hw/i386/intel_iommu_internal.h b/hw/i386/intel_iommu_internal.h > index a6c788049b..d0bb43ae87 100644 > --- a/hw/i386/intel_iommu_internal.h > +++ b/hw/i386/intel_iommu_internal.h > @@ -303,11 +303,6 @@ typedef enum VTDFaultReason { > > VTD_FR_PASID_TABLE_INV = 0x58, /*Invalid PASID table entry */ > > - /* This is not a normal fault reason. We use this to indicate some faults > - * that are not referenced by the VT-d specification. > - * Fault event with such reason should not be recorded. > - */ > - VTD_FR_RESERVED_ERR, > VTD_FR_MAX, /* Guard */ > } VTDFaultReason; > > -- > 2.25.1 >
Will do, thanks! On Thu, Mar 17, 2022 at 12:38:35PM +0800, Jason Wang wrote: > HI Michael: > > Want to take this series? > > Thanks > > On Thu, Feb 10, 2022 at 5:28 PM Jason Wang <jasowang@redhat.com> wrote: > > > > This fault reason is not used and is duplicated with SPT.2 condition > > code. So let's remove it. > > > > Signed-off-by: Jason Wang <jasowang@redhat.com> > > --- > > hw/i386/intel_iommu.c | 6 ------ > > hw/i386/intel_iommu_internal.h | 5 ----- > > 2 files changed, 11 deletions(-) > > > > diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c > > index 5b865ac08c..55281ee1b4 100644 > > --- a/hw/i386/intel_iommu.c > > +++ b/hw/i386/intel_iommu.c > > @@ -469,11 +469,6 @@ static void vtd_report_dmar_fault(IntelIOMMUState *s, uint16_t source_id, > > > > assert(fault < VTD_FR_MAX); > > > > - if (fault == VTD_FR_RESERVED_ERR) { > > - /* This is not a normal fault reason case. Drop it. */ > > - return; > > - } > > - > > trace_vtd_dmar_fault(source_id, fault, addr, is_write); > > > > if (fsts_reg & VTD_FSTS_PFO) { > > @@ -1629,7 +1624,6 @@ static const bool vtd_qualified_faults[] = { > > [VTD_FR_PAGING_ENTRY_RSVD] = true, > > [VTD_FR_CONTEXT_ENTRY_TT] = true, > > [VTD_FR_PASID_TABLE_INV] = false, > > - [VTD_FR_RESERVED_ERR] = false, > > [VTD_FR_MAX] = false, > > }; > > > > diff --git a/hw/i386/intel_iommu_internal.h b/hw/i386/intel_iommu_internal.h > > index a6c788049b..d0bb43ae87 100644 > > --- a/hw/i386/intel_iommu_internal.h > > +++ b/hw/i386/intel_iommu_internal.h > > @@ -303,11 +303,6 @@ typedef enum VTDFaultReason { > > > > VTD_FR_PASID_TABLE_INV = 0x58, /*Invalid PASID table entry */ > > > > - /* This is not a normal fault reason. We use this to indicate some faults > > - * that are not referenced by the VT-d specification. > > - * Fault event with such reason should not be recorded. > > - */ > > - VTD_FR_RESERVED_ERR, > > VTD_FR_MAX, /* Guard */ > > } VTDFaultReason; > > > > -- > > 2.25.1 > >
diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c index 5b865ac08c..55281ee1b4 100644 --- a/hw/i386/intel_iommu.c +++ b/hw/i386/intel_iommu.c @@ -469,11 +469,6 @@ static void vtd_report_dmar_fault(IntelIOMMUState *s, uint16_t source_id, assert(fault < VTD_FR_MAX); - if (fault == VTD_FR_RESERVED_ERR) { - /* This is not a normal fault reason case. Drop it. */ - return; - } - trace_vtd_dmar_fault(source_id, fault, addr, is_write); if (fsts_reg & VTD_FSTS_PFO) { @@ -1629,7 +1624,6 @@ static const bool vtd_qualified_faults[] = { [VTD_FR_PAGING_ENTRY_RSVD] = true, [VTD_FR_CONTEXT_ENTRY_TT] = true, [VTD_FR_PASID_TABLE_INV] = false, - [VTD_FR_RESERVED_ERR] = false, [VTD_FR_MAX] = false, }; diff --git a/hw/i386/intel_iommu_internal.h b/hw/i386/intel_iommu_internal.h index a6c788049b..d0bb43ae87 100644 --- a/hw/i386/intel_iommu_internal.h +++ b/hw/i386/intel_iommu_internal.h @@ -303,11 +303,6 @@ typedef enum VTDFaultReason { VTD_FR_PASID_TABLE_INV = 0x58, /*Invalid PASID table entry */ - /* This is not a normal fault reason. We use this to indicate some faults - * that are not referenced by the VT-d specification. - * Fault event with such reason should not be recorded. - */ - VTD_FR_RESERVED_ERR, VTD_FR_MAX, /* Guard */ } VTDFaultReason;
This fault reason is not used and is duplicated with SPT.2 condition code. So let's remove it. Signed-off-by: Jason Wang <jasowang@redhat.com> --- hw/i386/intel_iommu.c | 6 ------ hw/i386/intel_iommu_internal.h | 5 ----- 2 files changed, 11 deletions(-)