Commit 24e51604 authored by Neil Leeder's avatar Neil Leeder Committed by Will Deacon

ACPI/IORT: Add support for PMCG

Add support for the SMMU Performance Monitor Counter Group
information from ACPI. This is in preparation for its use
in the SMMUv3 PMU driver.
Signed-off-by: default avatarNeil Leeder <nleeder@codeaurora.org>
Signed-off-by: default avatarHanjun Guo <guohanjun@huawei.com>
Signed-off-by: default avatarShameer Kolothum <shameerali.kolothum.thodi@huawei.com>
Reviewed-by: default avatarRobin Murphy <robin.murphy@arm.com>
Acked-by: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent 79a3aaa7
...@@ -356,7 +356,8 @@ static struct acpi_iort_node *iort_node_get_id(struct acpi_iort_node *node, ...@@ -356,7 +356,8 @@ static struct acpi_iort_node *iort_node_get_id(struct acpi_iort_node *node,
if (map->flags & ACPI_IORT_ID_SINGLE_MAPPING) { if (map->flags & ACPI_IORT_ID_SINGLE_MAPPING) {
if (node->type == ACPI_IORT_NODE_NAMED_COMPONENT || if (node->type == ACPI_IORT_NODE_NAMED_COMPONENT ||
node->type == ACPI_IORT_NODE_PCI_ROOT_COMPLEX || node->type == ACPI_IORT_NODE_PCI_ROOT_COMPLEX ||
node->type == ACPI_IORT_NODE_SMMU_V3) { node->type == ACPI_IORT_NODE_SMMU_V3 ||
node->type == ACPI_IORT_NODE_PMCG) {
*id_out = map->output_base; *id_out = map->output_base;
return parent; return parent;
} }
...@@ -394,6 +395,8 @@ static int iort_get_id_mapping_index(struct acpi_iort_node *node) ...@@ -394,6 +395,8 @@ static int iort_get_id_mapping_index(struct acpi_iort_node *node)
} }
return smmu->id_mapping_index; return smmu->id_mapping_index;
case ACPI_IORT_NODE_PMCG:
return 0;
default: default:
return -EINVAL; return -EINVAL;
} }
...@@ -1218,14 +1221,23 @@ static void __init arm_smmu_v3_init_resources(struct resource *res, ...@@ -1218,14 +1221,23 @@ static void __init arm_smmu_v3_init_resources(struct resource *res,
} }
} }
static bool __init arm_smmu_v3_is_coherent(struct acpi_iort_node *node) static void __init arm_smmu_v3_dma_configure(struct device *dev,
struct acpi_iort_node *node)
{ {
struct acpi_iort_smmu_v3 *smmu; struct acpi_iort_smmu_v3 *smmu;
enum dev_dma_attr attr;
/* Retrieve SMMUv3 specific data */ /* Retrieve SMMUv3 specific data */
smmu = (struct acpi_iort_smmu_v3 *)node->node_data; smmu = (struct acpi_iort_smmu_v3 *)node->node_data;
return smmu->flags & ACPI_IORT_SMMU_V3_COHACC_OVERRIDE; attr = (smmu->flags & ACPI_IORT_SMMU_V3_COHACC_OVERRIDE) ?
DEV_DMA_COHERENT : DEV_DMA_NON_COHERENT;
/* We expect the dma masks to be equivalent for all SMMUv3 set-ups */
dev->dma_mask = &dev->coherent_dma_mask;
/* Configure DMA for the page table walker */
acpi_dma_configure(dev, attr);
} }
#if defined(CONFIG_ACPI_NUMA) #if defined(CONFIG_ACPI_NUMA)
...@@ -1301,30 +1313,82 @@ static void __init arm_smmu_init_resources(struct resource *res, ...@@ -1301,30 +1313,82 @@ static void __init arm_smmu_init_resources(struct resource *res,
} }
} }
static bool __init arm_smmu_is_coherent(struct acpi_iort_node *node) static void __init arm_smmu_dma_configure(struct device *dev,
struct acpi_iort_node *node)
{ {
struct acpi_iort_smmu *smmu; struct acpi_iort_smmu *smmu;
enum dev_dma_attr attr;
/* Retrieve SMMU specific data */ /* Retrieve SMMU specific data */
smmu = (struct acpi_iort_smmu *)node->node_data; smmu = (struct acpi_iort_smmu *)node->node_data;
return smmu->flags & ACPI_IORT_SMMU_COHERENT_WALK; attr = (smmu->flags & ACPI_IORT_SMMU_COHERENT_WALK) ?
DEV_DMA_COHERENT : DEV_DMA_NON_COHERENT;
/* We expect the dma masks to be equivalent for SMMU set-ups */
dev->dma_mask = &dev->coherent_dma_mask;
/* Configure DMA for the page table walker */
acpi_dma_configure(dev, attr);
}
static int __init arm_smmu_v3_pmcg_count_resources(struct acpi_iort_node *node)
{
struct acpi_iort_pmcg *pmcg;
/* Retrieve PMCG specific data */
pmcg = (struct acpi_iort_pmcg *)node->node_data;
/*
* There are always 2 memory resources.
* If the overflow_gsiv is present then add that for a total of 3.
*/
return pmcg->overflow_gsiv ? 3 : 2;
}
static void __init arm_smmu_v3_pmcg_init_resources(struct resource *res,
struct acpi_iort_node *node)
{
struct acpi_iort_pmcg *pmcg;
/* Retrieve PMCG specific data */
pmcg = (struct acpi_iort_pmcg *)node->node_data;
res[0].start = pmcg->page0_base_address;
res[0].end = pmcg->page0_base_address + SZ_4K - 1;
res[0].flags = IORESOURCE_MEM;
res[1].start = pmcg->page1_base_address;
res[1].end = pmcg->page1_base_address + SZ_4K - 1;
res[1].flags = IORESOURCE_MEM;
if (pmcg->overflow_gsiv)
acpi_iort_register_irq(pmcg->overflow_gsiv, "overflow",
ACPI_EDGE_SENSITIVE, &res[2]);
}
static int __init arm_smmu_v3_pmcg_add_platdata(struct platform_device *pdev)
{
u32 model = IORT_SMMU_V3_PMCG_GENERIC;
return platform_device_add_data(pdev, &model, sizeof(model));
} }
struct iort_dev_config { struct iort_dev_config {
const char *name; const char *name;
int (*dev_init)(struct acpi_iort_node *node); int (*dev_init)(struct acpi_iort_node *node);
bool (*dev_is_coherent)(struct acpi_iort_node *node); void (*dev_dma_configure)(struct device *dev,
struct acpi_iort_node *node);
int (*dev_count_resources)(struct acpi_iort_node *node); int (*dev_count_resources)(struct acpi_iort_node *node);
void (*dev_init_resources)(struct resource *res, void (*dev_init_resources)(struct resource *res,
struct acpi_iort_node *node); struct acpi_iort_node *node);
void (*dev_set_proximity)(struct device *dev, void (*dev_set_proximity)(struct device *dev,
struct acpi_iort_node *node); struct acpi_iort_node *node);
int (*dev_add_platdata)(struct platform_device *pdev);
}; };
static const struct iort_dev_config iort_arm_smmu_v3_cfg __initconst = { static const struct iort_dev_config iort_arm_smmu_v3_cfg __initconst = {
.name = "arm-smmu-v3", .name = "arm-smmu-v3",
.dev_is_coherent = arm_smmu_v3_is_coherent, .dev_dma_configure = arm_smmu_v3_dma_configure,
.dev_count_resources = arm_smmu_v3_count_resources, .dev_count_resources = arm_smmu_v3_count_resources,
.dev_init_resources = arm_smmu_v3_init_resources, .dev_init_resources = arm_smmu_v3_init_resources,
.dev_set_proximity = arm_smmu_v3_set_proximity, .dev_set_proximity = arm_smmu_v3_set_proximity,
...@@ -1332,9 +1396,16 @@ static const struct iort_dev_config iort_arm_smmu_v3_cfg __initconst = { ...@@ -1332,9 +1396,16 @@ static const struct iort_dev_config iort_arm_smmu_v3_cfg __initconst = {
static const struct iort_dev_config iort_arm_smmu_cfg __initconst = { static const struct iort_dev_config iort_arm_smmu_cfg __initconst = {
.name = "arm-smmu", .name = "arm-smmu",
.dev_is_coherent = arm_smmu_is_coherent, .dev_dma_configure = arm_smmu_dma_configure,
.dev_count_resources = arm_smmu_count_resources, .dev_count_resources = arm_smmu_count_resources,
.dev_init_resources = arm_smmu_init_resources .dev_init_resources = arm_smmu_init_resources,
};
static const struct iort_dev_config iort_arm_smmu_v3_pmcg_cfg __initconst = {
.name = "arm-smmu-v3-pmcg",
.dev_count_resources = arm_smmu_v3_pmcg_count_resources,
.dev_init_resources = arm_smmu_v3_pmcg_init_resources,
.dev_add_platdata = arm_smmu_v3_pmcg_add_platdata,
}; };
static __init const struct iort_dev_config *iort_get_dev_cfg( static __init const struct iort_dev_config *iort_get_dev_cfg(
...@@ -1345,6 +1416,8 @@ static __init const struct iort_dev_config *iort_get_dev_cfg( ...@@ -1345,6 +1416,8 @@ static __init const struct iort_dev_config *iort_get_dev_cfg(
return &iort_arm_smmu_v3_cfg; return &iort_arm_smmu_v3_cfg;
case ACPI_IORT_NODE_SMMU: case ACPI_IORT_NODE_SMMU:
return &iort_arm_smmu_cfg; return &iort_arm_smmu_cfg;
case ACPI_IORT_NODE_PMCG:
return &iort_arm_smmu_v3_pmcg_cfg;
default: default:
return NULL; return NULL;
} }
...@@ -1362,7 +1435,6 @@ static int __init iort_add_platform_device(struct acpi_iort_node *node, ...@@ -1362,7 +1435,6 @@ static int __init iort_add_platform_device(struct acpi_iort_node *node,
struct fwnode_handle *fwnode; struct fwnode_handle *fwnode;
struct platform_device *pdev; struct platform_device *pdev;
struct resource *r; struct resource *r;
enum dev_dma_attr attr;
int ret, count; int ret, count;
pdev = platform_device_alloc(ops->name, PLATFORM_DEVID_AUTO); pdev = platform_device_alloc(ops->name, PLATFORM_DEVID_AUTO);
...@@ -1393,19 +1465,19 @@ static int __init iort_add_platform_device(struct acpi_iort_node *node, ...@@ -1393,19 +1465,19 @@ static int __init iort_add_platform_device(struct acpi_iort_node *node,
goto dev_put; goto dev_put;
/* /*
* Add a copy of IORT node pointer to platform_data to * Platform devices based on PMCG nodes uses platform_data to
* be used to retrieve IORT data information. * pass the hardware model info to the driver. For others, add
* a copy of IORT node pointer to platform_data to be used to
* retrieve IORT data information.
*/ */
if (ops->dev_add_platdata)
ret = ops->dev_add_platdata(pdev);
else
ret = platform_device_add_data(pdev, &node, sizeof(node)); ret = platform_device_add_data(pdev, &node, sizeof(node));
if (ret) if (ret)
goto dev_put; goto dev_put;
/*
* We expect the dma masks to be equivalent for
* all SMMUs set-ups
*/
pdev->dev.dma_mask = &pdev->dev.coherent_dma_mask;
fwnode = iort_get_fwnode(node); fwnode = iort_get_fwnode(node);
if (!fwnode) { if (!fwnode) {
...@@ -1415,11 +1487,8 @@ static int __init iort_add_platform_device(struct acpi_iort_node *node, ...@@ -1415,11 +1487,8 @@ static int __init iort_add_platform_device(struct acpi_iort_node *node,
pdev->dev.fwnode = fwnode; pdev->dev.fwnode = fwnode;
attr = ops->dev_is_coherent && ops->dev_is_coherent(node) ? if (ops->dev_dma_configure)
DEV_DMA_COHERENT : DEV_DMA_NON_COHERENT; ops->dev_dma_configure(&pdev->dev, node);
/* Configure DMA for the page table walker */
acpi_dma_configure(&pdev->dev, attr);
iort_set_device_domain(&pdev->dev, node); iort_set_device_domain(&pdev->dev, node);
......
...@@ -26,6 +26,13 @@ ...@@ -26,6 +26,13 @@
#define IORT_IRQ_MASK(irq) (irq & 0xffffffffULL) #define IORT_IRQ_MASK(irq) (irq & 0xffffffffULL)
#define IORT_IRQ_TRIGGER_MASK(irq) ((irq >> 32) & 0xffffffffULL) #define IORT_IRQ_TRIGGER_MASK(irq) ((irq >> 32) & 0xffffffffULL)
/*
* PMCG model identifiers for use in smmu pmu driver. Please note
* that this is purely for the use of software and has nothing to
* do with hardware or with IORT specification.
*/
#define IORT_SMMU_V3_PMCG_GENERIC 0x00000000 /* Generic SMMUv3 PMCG */
int iort_register_domain_token(int trans_id, phys_addr_t base, int iort_register_domain_token(int trans_id, phys_addr_t base,
struct fwnode_handle *fw_node); struct fwnode_handle *fw_node);
void iort_deregister_domain_token(int trans_id); void iort_deregister_domain_token(int trans_id);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment