Commit 23c742db authored by Joerg Roedel's avatar Joerg Roedel
Browse files

iommu/amd: Split out PCI related parts of IOMMU initialization 



For interrupt remapping the relevant IOMMU initialization
needs to run earlier at boot when the PCI subsystem is not
yet initialized. To support that this patch splits the parts
of IOMMU initialization which need PCI accesses out of the
initial setup path so that this can be done later.

Signed-off-by: default avatarJoerg Roedel <joerg.roedel@amd.com>
parent 02f3b3f5

drivers/iommu/amd_iommu_init.c

+118 −106
Original line number Diff line number Diff line
@@ -714,90 +714,6 @@ static void __init set_device_exclusion_range(u16 devid, struct ivmd_header *m) 
	}

}



/*

 * This function reads some important data from the IOMMU PCI space and

 * initializes the driver data structure with it. It reads the hardware

 * capabilities and the first/last device entries

 */

static void __init init_iommu_from_pci(struct amd_iommu *iommu)

{

	int cap_ptr = iommu->cap_ptr;

	u32 range, misc, low, high;

	int i, j;



	pci_read_config_dword(iommu->dev, cap_ptr + MMIO_CAP_HDR_OFFSET,

			      &iommu->cap);

	pci_read_config_dword(iommu->dev, cap_ptr + MMIO_RANGE_OFFSET,

			      &range);

	pci_read_config_dword(iommu->dev, cap_ptr + MMIO_MISC_OFFSET,

			      &misc);



	iommu->first_device = calc_devid(MMIO_GET_BUS(range),

					 MMIO_GET_FD(range));

	iommu->last_device = calc_devid(MMIO_GET_BUS(range),

					MMIO_GET_LD(range));

	iommu->evt_msi_num = MMIO_MSI_NUM(misc);



	if (!(iommu->cap & (1 << IOMMU_CAP_IOTLB)))

		amd_iommu_iotlb_sup = false;



	/* read extended feature bits */

	low  = readl(iommu->mmio_base + MMIO_EXT_FEATURES);

	high = readl(iommu->mmio_base + MMIO_EXT_FEATURES + 4);



	iommu->features = ((u64)high << 32) | low;



	if (iommu_feature(iommu, FEATURE_GT)) {

		int glxval;

		u32 pasids;

		u64 shift;



		shift   = iommu->features & FEATURE_PASID_MASK;

		shift >>= FEATURE_PASID_SHIFT;

		pasids  = (1 << shift);



		amd_iommu_max_pasids = min(amd_iommu_max_pasids, pasids);



		glxval   = iommu->features & FEATURE_GLXVAL_MASK;

		glxval >>= FEATURE_GLXVAL_SHIFT;



		if (amd_iommu_max_glx_val == -1)

			amd_iommu_max_glx_val = glxval;

		else

			amd_iommu_max_glx_val = min(amd_iommu_max_glx_val, glxval);

	}



	if (iommu_feature(iommu, FEATURE_GT) &&

	    iommu_feature(iommu, FEATURE_PPR)) {

		iommu->is_iommu_v2   = true;

		amd_iommu_v2_present = true;

	}



	if (!is_rd890_iommu(iommu->dev))

		return;



	/*

	 * Some rd890 systems may not be fully reconfigured by the BIOS, so

	 * it's necessary for us to store this information so it can be

	 * reprogrammed on resume

	 */



	pci_read_config_dword(iommu->dev, iommu->cap_ptr + 4,

			      &iommu->stored_addr_lo);

	pci_read_config_dword(iommu->dev, iommu->cap_ptr + 8,

			      &iommu->stored_addr_hi);



	/* Low bit locks writes to configuration space */

	iommu->stored_addr_lo &= ~1;



	for (i = 0; i < 6; i++)

		for (j = 0; j < 0x12; j++)

			iommu->stored_l1[i][j] = iommu_read_l1(iommu, i, j);



	for (i = 0; i < 0x83; i++)

		iommu->stored_l2[i] = iommu_read_l2(iommu, i);

}



/*

 * Takes a pointer to an AMD IOMMU entry in the ACPI table and

 * initializes the hardware and our data structures with it.
@@ -1014,13 +930,7 @@ static int __init init_iommu_one(struct amd_iommu *iommu, struct ivhd_header *h) 
	/*

	 * Copy data from ACPI table entry to the iommu struct

	 */

	iommu->dev = pci_get_bus_and_slot(PCI_BUS(h->devid), h->devid & 0xff);

	if (!iommu->dev)

		return 1;



	iommu->root_pdev = pci_get_bus_and_slot(iommu->dev->bus->number,

						PCI_DEVFN(0, 0));



	iommu->devid   = h->devid;

	iommu->cap_ptr = h->cap_ptr;

	iommu->pci_seg = h->pci_seg;

	iommu->mmio_phys = h->mmio_phys;
@@ -1038,20 +948,10 @@ static int __init init_iommu_one(struct amd_iommu *iommu, struct ivhd_header *h) 


	iommu->int_enabled = false;



	init_iommu_from_pci(iommu);

	init_iommu_from_acpi(iommu, h);

	init_iommu_devices(iommu);



	if (iommu_feature(iommu, FEATURE_PPR)) {

		iommu->ppr_log = alloc_ppr_log(iommu);

		if (!iommu->ppr_log)

			return -ENOMEM;

	}



	if (iommu->cap & (1UL << IOMMU_CAP_NPCACHE))

		amd_iommu_np_cache = true;



	return pci_enable_device(iommu->dev);

	return 0;

}



/*
@@ -1100,6 +1000,121 @@ static int __init init_iommu_all(struct acpi_table_header *table) 
	return 0;

}



static int iommu_init_pci(struct amd_iommu *iommu)

{

	int cap_ptr = iommu->cap_ptr;

	u32 range, misc, low, high;



	iommu->dev = pci_get_bus_and_slot(PCI_BUS(iommu->devid),

					  iommu->devid & 0xff);

	if (!iommu->dev)

		return -ENODEV;



	pci_read_config_dword(iommu->dev, cap_ptr + MMIO_CAP_HDR_OFFSET,

			      &iommu->cap);

	pci_read_config_dword(iommu->dev, cap_ptr + MMIO_RANGE_OFFSET,

			      &range);

	pci_read_config_dword(iommu->dev, cap_ptr + MMIO_MISC_OFFSET,

			      &misc);



	iommu->first_device = calc_devid(MMIO_GET_BUS(range),

					 MMIO_GET_FD(range));

	iommu->last_device = calc_devid(MMIO_GET_BUS(range),

					MMIO_GET_LD(range));



	if (!(iommu->cap & (1 << IOMMU_CAP_IOTLB)))

		amd_iommu_iotlb_sup = false;



	/* read extended feature bits */

	low  = readl(iommu->mmio_base + MMIO_EXT_FEATURES);

	high = readl(iommu->mmio_base + MMIO_EXT_FEATURES + 4);



	iommu->features = ((u64)high << 32) | low;



	if (iommu_feature(iommu, FEATURE_GT)) {

		int glxval;

		u32 pasids;

		u64 shift;



		shift   = iommu->features & FEATURE_PASID_MASK;

		shift >>= FEATURE_PASID_SHIFT;

		pasids  = (1 << shift);



		amd_iommu_max_pasids = min(amd_iommu_max_pasids, pasids);



		glxval   = iommu->features & FEATURE_GLXVAL_MASK;

		glxval >>= FEATURE_GLXVAL_SHIFT;



		if (amd_iommu_max_glx_val == -1)

			amd_iommu_max_glx_val = glxval;

		else

			amd_iommu_max_glx_val = min(amd_iommu_max_glx_val, glxval);

	}



	if (iommu_feature(iommu, FEATURE_GT) &&

	    iommu_feature(iommu, FEATURE_PPR)) {

		iommu->is_iommu_v2   = true;

		amd_iommu_v2_present = true;

	}



	if (iommu_feature(iommu, FEATURE_PPR)) {

		iommu->ppr_log = alloc_ppr_log(iommu);

		if (!iommu->ppr_log)

			return -ENOMEM;

	}



	if (iommu->cap & (1UL << IOMMU_CAP_NPCACHE))

		amd_iommu_np_cache = true;



	if (is_rd890_iommu(iommu->dev)) {

		int i, j;



		iommu->root_pdev = pci_get_bus_and_slot(iommu->dev->bus->number,

				PCI_DEVFN(0, 0));



		/*

		 * Some rd890 systems may not be fully reconfigured by the

		 * BIOS, so it's necessary for us to store this information so

		 * it can be reprogrammed on resume

		 */

		pci_read_config_dword(iommu->dev, iommu->cap_ptr + 4,

				&iommu->stored_addr_lo);

		pci_read_config_dword(iommu->dev, iommu->cap_ptr + 8,

				&iommu->stored_addr_hi);



		/* Low bit locks writes to configuration space */

		iommu->stored_addr_lo &= ~1;



		for (i = 0; i < 6; i++)

			for (j = 0; j < 0x12; j++)

				iommu->stored_l1[i][j] = iommu_read_l1(iommu, i, j);



		for (i = 0; i < 0x83; i++)

			iommu->stored_l2[i] = iommu_read_l2(iommu, i);

	}



	return pci_enable_device(iommu->dev);

}



static int amd_iommu_init_pci(void)

{

	struct amd_iommu *iommu;

	int ret = 0;



	for_each_iommu(iommu) {

		ret = iommu_init_pci(iommu);

		if (ret)

			break;

	}



	/* Make sure ACS will be enabled */

	pci_request_acs();



	ret = amd_iommu_init_devices();



	return ret;

}



/****************************************************************************

 *

 * The following functions initialize the MSI interrupts for all IOMMUs
@@ -1563,7 +1578,7 @@ int __init amd_iommu_init_hardware(void) 
	if (ret)

		goto free;



	ret = amd_iommu_init_devices();

	ret = amd_iommu_init_pci();

	if (ret)

		goto free;
@@ -1696,9 +1711,6 @@ int __init amd_iommu_detect(void) 
	iommu_detected = 1;

	x86_init.iommu.iommu_init = amd_iommu_init;



	/* Make sure ACS will be enabled */

	pci_request_acs();



	return 0;

}

drivers/iommu/amd_iommu_types.h

+3 −2
Original line number Diff line number Diff line
@@ -501,6 +501,9 @@ struct amd_iommu { 
	/* IOMMUv2 */

	bool is_iommu_v2;



	/* PCI device id of the IOMMU device */

	u16 devid;



	/*

	 * Capability pointer. There could be more than one IOMMU per PCI

	 * device function if there are more than one AMD IOMMU capability
@@ -530,8 +533,6 @@ struct amd_iommu { 
	u32 evt_buf_size;

	/* event buffer virtual address */

	u8 *evt_buf;

	/* MSI number for event interrupt */

	u16 evt_msi_num;



	/* Base of the PPR log, if present */

	u8 *ppr_log;

CRA Git | Maintained and supported by SUSTech CRA and CCSE