iommu/ipmmu-vmsa: Introduce features, break out alias
Introduce struct ipmmu_features to track various hardware and software implementation changes inside the driver for different kinds of IPMMU hardware. Add use_ns_alias_offset as a first example of a feature to control if the secure register bank offset should be used or not. Signed-off-by: Magnus Damm <damm+renesas@opensource.se> Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
This commit is contained in:
parent
49c875f030
commit
33f3ac9b51
|
@ -19,6 +19,7 @@
|
||||||
#include <linux/iommu.h>
|
#include <linux/iommu.h>
|
||||||
#include <linux/module.h>
|
#include <linux/module.h>
|
||||||
#include <linux/of.h>
|
#include <linux/of.h>
|
||||||
|
#include <linux/of_device.h>
|
||||||
#include <linux/of_platform.h>
|
#include <linux/of_platform.h>
|
||||||
#include <linux/platform_device.h>
|
#include <linux/platform_device.h>
|
||||||
#include <linux/sizes.h>
|
#include <linux/sizes.h>
|
||||||
|
@ -38,11 +39,15 @@
|
||||||
|
|
||||||
#define IPMMU_CTX_MAX 1
|
#define IPMMU_CTX_MAX 1
|
||||||
|
|
||||||
|
struct ipmmu_features {
|
||||||
|
bool use_ns_alias_offset;
|
||||||
|
};
|
||||||
|
|
||||||
struct ipmmu_vmsa_device {
|
struct ipmmu_vmsa_device {
|
||||||
struct device *dev;
|
struct device *dev;
|
||||||
void __iomem *base;
|
void __iomem *base;
|
||||||
struct iommu_device iommu;
|
struct iommu_device iommu;
|
||||||
|
const struct ipmmu_features *features;
|
||||||
unsigned int num_utlbs;
|
unsigned int num_utlbs;
|
||||||
spinlock_t lock; /* Protects ctx and domains[] */
|
spinlock_t lock; /* Protects ctx and domains[] */
|
||||||
DECLARE_BITMAP(ctx, IPMMU_CTX_MAX);
|
DECLARE_BITMAP(ctx, IPMMU_CTX_MAX);
|
||||||
|
@ -817,6 +822,21 @@ static void ipmmu_device_reset(struct ipmmu_vmsa_device *mmu)
|
||||||
ipmmu_write(mmu, i * IM_CTX_SIZE + IMCTR, 0);
|
ipmmu_write(mmu, i * IM_CTX_SIZE + IMCTR, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static const struct ipmmu_features ipmmu_features_default = {
|
||||||
|
.use_ns_alias_offset = true,
|
||||||
|
};
|
||||||
|
|
||||||
|
static const struct of_device_id ipmmu_of_ids[] = {
|
||||||
|
{
|
||||||
|
.compatible = "renesas,ipmmu-vmsa",
|
||||||
|
.data = &ipmmu_features_default,
|
||||||
|
}, {
|
||||||
|
/* Terminator */
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
MODULE_DEVICE_TABLE(of, ipmmu_of_ids);
|
||||||
|
|
||||||
static int ipmmu_probe(struct platform_device *pdev)
|
static int ipmmu_probe(struct platform_device *pdev)
|
||||||
{
|
{
|
||||||
struct ipmmu_vmsa_device *mmu;
|
struct ipmmu_vmsa_device *mmu;
|
||||||
|
@ -834,6 +854,7 @@ static int ipmmu_probe(struct platform_device *pdev)
|
||||||
mmu->num_utlbs = 32;
|
mmu->num_utlbs = 32;
|
||||||
spin_lock_init(&mmu->lock);
|
spin_lock_init(&mmu->lock);
|
||||||
bitmap_zero(mmu->ctx, IPMMU_CTX_MAX);
|
bitmap_zero(mmu->ctx, IPMMU_CTX_MAX);
|
||||||
|
mmu->features = of_device_get_match_data(&pdev->dev);
|
||||||
|
|
||||||
/* Map I/O memory and request IRQ. */
|
/* Map I/O memory and request IRQ. */
|
||||||
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
||||||
|
@ -853,7 +874,8 @@ static int ipmmu_probe(struct platform_device *pdev)
|
||||||
* Offset the registers base unconditionally to point to the non-secure
|
* Offset the registers base unconditionally to point to the non-secure
|
||||||
* alias space for now.
|
* alias space for now.
|
||||||
*/
|
*/
|
||||||
mmu->base += IM_NS_ALIAS_OFFSET;
|
if (mmu->features->use_ns_alias_offset)
|
||||||
|
mmu->base += IM_NS_ALIAS_OFFSET;
|
||||||
|
|
||||||
irq = platform_get_irq(pdev, 0);
|
irq = platform_get_irq(pdev, 0);
|
||||||
if (irq < 0) {
|
if (irq < 0) {
|
||||||
|
@ -907,11 +929,6 @@ static int ipmmu_remove(struct platform_device *pdev)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static const struct of_device_id ipmmu_of_ids[] = {
|
|
||||||
{ .compatible = "renesas,ipmmu-vmsa", },
|
|
||||||
{ }
|
|
||||||
};
|
|
||||||
|
|
||||||
static struct platform_driver ipmmu_driver = {
|
static struct platform_driver ipmmu_driver = {
|
||||||
.driver = {
|
.driver = {
|
||||||
.name = "ipmmu-vmsa",
|
.name = "ipmmu-vmsa",
|
||||||
|
|
Loading…
Reference in New Issue