Commit 75e6d7ed authored by Suravee Suthikulpanit's avatar Suravee Suthikulpanit Committed by Joerg Roedel
Browse files

iommu/amd: Consolidate timeout pre-define to amd_iommu_type.h 



To allow inclusion in other files in subsequent patches.

Signed-off-by: default avatarSuravee Suthikulpanit <suravee.suthikulpanit@amd.com>
Signed-off-by: default avatarVasant Hegde <vasant.hegde@amd.com>
Reviewed-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Reviewed-by: default avatarJerry Snitselaar <jsnitsel@redhat.com>
Link: https://lore.kernel.org/r/20230921092147.5930-3-vasant.hegde@amd.com


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

drivers/iommu/amd/amd_iommu_types.h

+4 −0
Original line number Diff line number Diff line
@@ -451,6 +451,10 @@ 
#define PD_IOMMUV2_MASK		BIT(3) /* domain has gcr3 table */

#define PD_GIOV_MASK		BIT(4) /* domain enable GIOV support */



/* Timeout stuff */

#define LOOP_TIMEOUT		100000

#define MMIO_STATUS_TIMEOUT	2000000



extern bool amd_iommu_dump;

#define DUMP_printk(format, arg...)				\

	do {							\

drivers/iommu/amd/init.c

+4 −6
Original line number Diff line number Diff line
@@ -83,8 +83,6 @@ 
#define ACPI_DEVFLAG_LINT1              0x80

#define ACPI_DEVFLAG_ATSDIS             0x10000000



#define LOOP_TIMEOUT	2000000



#define IVRS_GET_SBDF_ID(seg, bus, dev, fn)	(((seg & 0xffff) << 16) | ((bus & 0xff) << 8) \

						 | ((dev & 0x1f) << 3) | (fn & 0x7))
@@ -985,14 +983,14 @@ static int iommu_ga_log_enable(struct amd_iommu *iommu) 
	iommu_feature_enable(iommu, CONTROL_GAINT_EN);

	iommu_feature_enable(iommu, CONTROL_GALOG_EN);



	for (i = 0; i < LOOP_TIMEOUT; ++i) {

	for (i = 0; i < MMIO_STATUS_TIMEOUT; ++i) {

		status = readl(iommu->mmio_base + MMIO_STATUS_OFFSET);

		if (status & (MMIO_STATUS_GALOG_RUN_MASK))

			break;

		udelay(10);

	}



	if (WARN_ON(i >= LOOP_TIMEOUT))

	if (WARN_ON(i >= MMIO_STATUS_TIMEOUT))

		return -EINVAL;



	return 0;
@@ -2900,14 +2898,14 @@ static void enable_iommus_vapic(void) 
		 * Need to set and poll check the GALOGRun bit to zero before

		 * we can set/ modify GA Log registers safely.

		 */

		for (i = 0; i < LOOP_TIMEOUT; ++i) {

		for (i = 0; i < MMIO_STATUS_TIMEOUT; ++i) {

			status = readl(iommu->mmio_base + MMIO_STATUS_OFFSET);

			if (!(status & MMIO_STATUS_GALOG_RUN_MASK))

				break;

			udelay(10);

		}



		if (WARN_ON(i >= LOOP_TIMEOUT))

		if (WARN_ON(i >= MMIO_STATUS_TIMEOUT))

			return;

	}

drivers/iommu/amd/iommu.c

+0 −2
Original line number Diff line number Diff line
@@ -44,8 +44,6 @@ 


#define CMD_SET_TYPE(cmd, t) ((cmd)->data[1] |= ((t) << 28))



#define LOOP_TIMEOUT	100000



/* IO virtual address start page frame number */

#define IOVA_START_PFN		(1)

#define IOVA_PFN(addr)		((addr) >> PAGE_SHIFT)