Commit fffaed1e authored by Jacob Pan's avatar Jacob Pan Committed by Joerg Roedel
Browse files

iommu/ioasid: Rename INVALID_IOASID 



INVALID_IOASID and IOMMU_PASID_INVALID are duplicated. Rename
INVALID_IOASID and consolidate since we are moving away from IOASID
infrastructure.

Reviewed-by: default avatarDave Jiang <dave.jiang@intel.com>
Reviewed-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Reviewed-by: default avatarKevin Tian <kevin.tian@intel.com>
Reviewed-by: default avatarLu Baolu <baolu.lu@linux.intel.com>
Signed-off-by: default avatarJacob Pan <jacob.jun.pan@linux.intel.com>
Link: https://lore.kernel.org/r/20230322200803.869130-7-jacob.jun.pan@linux.intel.com


Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent 1a14bf0f

Documentation/x86/sva.rst

+1 −1
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ process share the same page tables, thus the same MSR value. 
PASID Life Cycle Management

===========================



PASID is initialized as INVALID_IOASID (-1) when a process is created.

PASID is initialized as IOMMU_PASID_INVALID (-1) when a process is created.



Only processes that access SVA-capable devices need to have a PASID

allocated. This allocation happens when a process opens/binds an SVA-capable

arch/x86/kernel/traps.c

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ 
#include <linux/io.h>

#include <linux/hardirq.h>

#include <linux/atomic.h>

#include <linux/ioasid.h>

#include <linux/iommu.h>



#include <asm/stacktrace.h>

#include <asm/processor.h>

drivers/dma/idxd/device.c

+4 −4
Original line number Diff line number Diff line
@@ -1194,7 +1194,7 @@ static void idxd_device_set_perm_entry(struct idxd_device *idxd, 
{

	union msix_perm mperm;



	if (ie->pasid == INVALID_IOASID)

	if (ie->pasid == IOMMU_PASID_INVALID)

		return;



	mperm.bits = 0;
@@ -1224,7 +1224,7 @@ void idxd_wq_free_irq(struct idxd_wq *wq) 
	idxd_device_clear_perm_entry(idxd, ie);

	ie->vector = -1;

	ie->int_handle = INVALID_INT_HANDLE;

	ie->pasid = INVALID_IOASID;

	ie->pasid = IOMMU_PASID_INVALID;

}



int idxd_wq_request_irq(struct idxd_wq *wq)
@@ -1240,7 +1240,7 @@ int idxd_wq_request_irq(struct idxd_wq *wq) 


	ie = &wq->ie;

	ie->vector = pci_irq_vector(pdev, ie->id);

	ie->pasid = device_pasid_enabled(idxd) ? idxd->pasid : INVALID_IOASID;

	ie->pasid = device_pasid_enabled(idxd) ? idxd->pasid : IOMMU_PASID_INVALID;

	idxd_device_set_perm_entry(idxd, ie);



	rc = request_threaded_irq(ie->vector, NULL, idxd_wq_thread, 0, "idxd-portal", ie);
@@ -1265,7 +1265,7 @@ int idxd_wq_request_irq(struct idxd_wq *wq) 
	free_irq(ie->vector, ie);

err_irq:

	idxd_device_clear_perm_entry(idxd, ie);

	ie->pasid = INVALID_IOASID;

	ie->pasid = IOMMU_PASID_INVALID;

	return rc;

}

drivers/dma/idxd/idxd.h

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include <linux/ioasid.h>

#include <linux/bitmap.h>

#include <linux/perf_event.h>

#include <linux/iommu.h>

#include <uapi/linux/idxd.h>

#include "registers.h"

drivers/dma/idxd/init.c

+1 −1
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ static int idxd_setup_interrupts(struct idxd_device *idxd) 
		ie = idxd_get_ie(idxd, msix_idx);

		ie->id = msix_idx;

		ie->int_handle = INVALID_INT_HANDLE;

		ie->pasid = INVALID_IOASID;

		ie->pasid = IOMMU_PASID_INVALID;



		spin_lock_init(&ie->list_lock);

		init_llist_head(&ie->pending_llist);