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

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

of/irq: Make of_msi_map_rid() PCI bus agnostic 



[ Upstream commit 2bcdd8f2c07f1aa1bfd34fa0dab8e06949e34846 ]

There is nothing PCI bus specific in the of_msi_map_rid()
implementation other than the requester ID tag for the input
ID space. Rename requester ID to a more generic ID so that
the translation code can be used by all busses that require
input/output ID translations.

No functional change intended.

Signed-off-by: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Reviewed-by: default avatarRob Herring <robh@kernel.org>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Rob Herring <robh+dt@kernel.org>
Cc: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20200619082013.13661-11-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 ae374c57

drivers/of/irq.c

+14 −14
Original line number Diff line number Diff line
@@ -576,43 +576,43 @@ void __init of_irq_init(const struct of_device_id *matches) 
	}

}



static u32 __of_msi_map_rid(struct device *dev, struct device_node **np,

			    u32 rid_in)

static u32 __of_msi_map_id(struct device *dev, struct device_node **np,

			    u32 id_in)

{

	struct device *parent_dev;

	u32 rid_out = rid_in;

	u32 id_out = id_in;



	/*

	 * Walk up the device parent links looking for one with a

	 * "msi-map" property.

	 */

	for (parent_dev = dev; parent_dev; parent_dev = parent_dev->parent)

		if (!of_map_id(parent_dev->of_node, rid_in, "msi-map",

				"msi-map-mask", np, &rid_out))

		if (!of_map_id(parent_dev->of_node, id_in, "msi-map",

				"msi-map-mask", np, &id_out))

			break;

	return rid_out;

	return id_out;

}



/**

 * of_msi_map_rid - Map a MSI requester ID for a device.

 * of_msi_map_id - Map a MSI ID for a device.

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

 * @msi_np: device node of the expected msi controller.

 * @rid_in: unmapped MSI requester ID for the device.

 * @id_in: unmapped MSI ID for the device.

 *

 * Walk up the device hierarchy looking for devices with a "msi-map"

 * property.  If found, apply the mapping to @rid_in.

 * property.  If found, apply the mapping to @id_in.

 *

 * Returns the mapped MSI requester ID.

 * Returns the mapped MSI ID.

 */

u32 of_msi_map_rid(struct device *dev, struct device_node *msi_np, u32 rid_in)

u32 of_msi_map_id(struct device *dev, struct device_node *msi_np, u32 id_in)

{

	return __of_msi_map_rid(dev, &msi_np, rid_in);

	return __of_msi_map_id(dev, &msi_np, id_in);

}



/**

 * of_msi_map_get_device_domain - Use msi-map to find the relevant MSI domain

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

 * @rid: Requester ID for the device.

 * @id: Device ID.

 * @bus_token: Bus token

 *

 * Walk up the device hierarchy looking for devices with a "msi-map"
@@ -625,7 +625,7 @@ struct irq_domain *of_msi_map_get_device_domain(struct device *dev, u32 id, 
{

	struct device_node *np = NULL;



	__of_msi_map_rid(dev, &np, id);

	__of_msi_map_id(dev, &np, id);

	return irq_find_matching_host(np, bus_token);

}

drivers/pci/msi.c

+1 −1
Original line number Diff line number Diff line
@@ -1603,7 +1603,7 @@ u32 pci_msi_domain_get_msi_rid(struct irq_domain *domain, struct pci_dev *pdev) 
	pci_for_each_dma_alias(pdev, get_msi_id_cb, &rid);



	of_node = irq_domain_get_of_node(domain);

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

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

			iort_msi_map_id(&pdev->dev, rid);



	return rid;

include/linux/of_irq.h

+4 −4
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ extern struct irq_domain *of_msi_map_get_device_domain(struct device *dev, 
							u32 id,

							u32 bus_token);

extern void of_msi_configure(struct device *dev, struct device_node *np);

u32 of_msi_map_rid(struct device *dev, struct device_node *msi_np, u32 rid_in);

u32 of_msi_map_id(struct device *dev, struct device_node *msi_np, u32 id_in);

#else

static inline int of_irq_count(struct device_node *dev)

{
@@ -93,10 +93,10 @@ static inline struct irq_domain *of_msi_map_get_device_domain(struct device *dev 
static inline void of_msi_configure(struct device *dev, struct device_node *np)

{

}

static inline u32 of_msi_map_rid(struct device *dev,

				 struct device_node *msi_np, u32 rid_in)

static inline u32 of_msi_map_id(struct device *dev,

				 struct device_node *msi_np, u32 id_in)

{

	return rid_in;

	return id_in;

}

#endif