Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f7a85520 authored by Lorenzo Pieralisi's avatar Lorenzo Pieralisi Committed by Greg Kroah-Hartman
Browse files

ACPI/IORT: Make iort_msi_map_rid() PCI agnostic 



[ Upstream commit 39c3cf566ceafa7c1ae331a5f26fbb685d670001 ]

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.

Signed-off-by: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Acked-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Cc: Will Deacon <will@kernel.org>
Cc: Hanjun Guo <guohanjun@huawei.com>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Sudeep Holla <sudeep.holla@arm.com>
Cc: Robin Murphy <robin.murphy@arm.com>
Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net>
Link: https://lore.kernel.org/r/20200619082013.13661-4-lorenzo.pieralisi@arm.com


Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Stable-dep-of: d79972789d17 ("of: dynamic: Fix of_reconfig_get_state_change() return value documentation")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent da36a3ef

drivers/acpi/arm64/iort.c

+6 −6
Original line number Diff line number Diff line
@@ -521,22 +521,22 @@ static struct acpi_iort_node *iort_find_dev_node(struct device *dev) 
}



/**

 * iort_msi_map_rid() - Map a MSI requester ID for a device

 * iort_msi_map_id() - Map a MSI input ID for a device

 * @dev: The device for which the mapping is to be done.

 * @req_id: The device requester ID.

 * @input_id: The device input ID.

 *

 * Returns: mapped MSI RID on success, input requester ID otherwise

 * Returns: mapped MSI ID on success, input ID otherwise

 */

u32 iort_msi_map_rid(struct device *dev, u32 req_id)

u32 iort_msi_map_id(struct device *dev, u32 input_id)

{

	struct acpi_iort_node *node;

	u32 dev_id;



	node = iort_find_dev_node(dev);

	if (!node)

		return req_id;

		return input_id;



	iort_node_map_id(node, req_id, &dev_id, IORT_MSI_TYPE);

	iort_node_map_id(node, input_id, &dev_id, IORT_MSI_TYPE);

	return dev_id;

}

drivers/pci/msi.c

+1 −1
Original line number Diff line number Diff line
@@ -1604,7 +1604,7 @@ u32 pci_msi_domain_get_msi_rid(struct irq_domain *domain, struct pci_dev *pdev) 


	of_node = irq_domain_get_of_node(domain);

	rid = of_node ? of_msi_map_rid(&pdev->dev, of_node, rid) :

			iort_msi_map_rid(&pdev->dev, rid);

			iort_msi_map_id(&pdev->dev, rid);



	return rid;

}

include/linux/acpi_iort.h

+3 −3
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ void iort_deregister_domain_token(int trans_id); 
struct fwnode_handle *iort_find_domain_token(int trans_id);

#ifdef CONFIG_ACPI_IORT

void acpi_iort_init(void);

u32 iort_msi_map_rid(struct device *dev, u32 req_id);

u32 iort_msi_map_id(struct device *dev, u32 id);

struct irq_domain *iort_get_device_domain(struct device *dev, u32 id,

					  enum irq_domain_bus_token bus_token);

void acpi_configure_pmsi_domain(struct device *dev);
@@ -40,8 +40,8 @@ const struct iommu_ops *iort_iommu_configure(struct device *dev); 
int iort_iommu_msi_get_resv_regions(struct device *dev, struct list_head *head);

#else

static inline void acpi_iort_init(void) { }

static inline u32 iort_msi_map_rid(struct device *dev, u32 req_id)

{ return req_id; }

static inline u32 iort_msi_map_id(struct device *dev, u32 id)

{ return id; }

static inline struct irq_domain *iort_get_device_domain(

	struct device *dev, u32 id, enum irq_domain_bus_token bus_token)

{ return NULL; }