ACPI/IORT: Make iort_msi_map_rid() PCI agnostic

There is nothing PCI specific in iort_msi_map_rid(). Rename the function using a bus protocol agnostic name, iort_msi_map_id(), and convert current callers to it.

Lorenzo Pieralisi committed 6 years ago

Commit 39c3cf51 parent d1718a13 files · +10 −10Browse files

Unified · Split

3 files

drivers/acpi/arm64/iort.c +6 −6
drivers/pci/msi.c +1 −1
include/linux/acpi_iort.h +3 −3

drivers/acpi/arm64/iort.c+6−6

@@ -568,22 +568,22 @@ static struct acpi_iort_node iort_find_dev_node(struct device dev) · 567 unmodified lines
568	568	}
569	569
570	570	/**
571		− * iort_msi_map_rid() - Map a MSI requester ID for a device
	571	+ * iort_msi_map_id() - Map a MSI input ID for a device
572	572	* @dev: The device for which the mapping is to be done.
573		− * @req_id: The device requester ID.
	573	+ * @input_id: The device input ID.
574	574	*
575		− * Returns: mapped MSI RID on success, input requester ID otherwise
	575	+ * Returns: mapped MSI ID on success, input ID otherwise
576	576	*/
577		−u32 iort_msi_map_rid(struct device *dev, u32 req_id)
	577	+u32 iort_msi_map_id(struct device *dev, u32 input_id)
578	578	{
579	579	struct acpi_iort_node *node;
580	580	u32 dev_id;
581	581
582	582	node = iort_find_dev_node(dev);
583	583	if (!node)
584		− return req_id;
	584	+ return input_id;
585	585
586		− iort_node_map_id(node, req_id, &dev_id, IORT_MSI_TYPE);
	586	+ iort_node_map_id(node, input_id, &dev_id, IORT_MSI_TYPE);
587	587	return dev_id;
588	588	}
589	589

drivers/pci/msi.c+1−1

@@ -1536,7 +1536,7 @@ u32 pci_msi_domain_get_msi_rid(struct irq_domain domain, struct pci_dev pdev) · 1535 unmodified lines
1536	1536
1537	1537	of_node = irq_domain_get_of_node(domain);
1538	1538	rid = of_node ? of_msi_map_rid(&pdev->dev, of_node, rid) :
1539		− iort_msi_map_rid(&pdev->dev, rid);
	1539	+ iort_msi_map_id(&pdev->dev, rid);
1540	1540
1541	1541	return rid;
1542	1542	}

include/linux/acpi_iort.h+3−3

@@ -28,7 +28,7 @@ void iort_deregister_domain_token(int trans_id); · 27 unmodified lines
28	28	struct fwnode_handle *iort_find_domain_token(int trans_id);
29	29	#ifdef CONFIG_ACPI_IORT
30	30	void acpi_iort_init(void);
31		−u32 iort_msi_map_rid(struct device *dev, u32 req_id);
	31	+u32 iort_msi_map_id(struct device *dev, u32 id);
32	32	struct irq_domain iort_get_device_domain(struct device dev, u32 id,
33	33	enum irq_domain_bus_token bus_token);
34	34	void acpi_configure_pmsi_domain(struct device *dev);
@@ -39,8 +39,8 @@ const struct iommu_ops iort_iommu_configure(struct device dev); · 4 unmodified lines
39	39	int iort_iommu_msi_get_resv_regions(struct device dev, struct list_head head);
40	40	#else
41	41	static inline void acpi_iort_init(void) { }
42		−static inline u32 iort_msi_map_rid(struct device *dev, u32 req_id)
43		−{ return req_id; }
	42	+static inline u32 iort_msi_map_id(struct device *dev, u32 id)
	43	+{ return id; }
44	44	static inline struct irq_domain *iort_get_device_domain(
45	45	struct device *dev, u32 id, enum irq_domain_bus_token bus_token)
46	46	{ return NULL; }