Commit 786dfe49 authored by Joerg Roedel's avatar Joerg Roedel
Browse files

iommu/amd: Merge private header files 



Merge amd_iommu_proto.h into amd_iommu.h.

Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
Reviewed-by: default avatarSuravee Suthikulpanit <suravee.suthikulpanit@amd.com>
Link: https://lore.kernel.org/r/20200527115313.7426-9-joro@8bytes.org
parent e1980df3

drivers/iommu/amd_iommu.c

+1 −3
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 
#include <linux/dma-direct.h>

#include <linux/dma-iommu.h>

#include <linux/iommu-helper.h>

#include <linux/iommu.h>

#include <linux/delay.h>

#include <linux/amd-iommu.h>

#include <linux/notifier.h>
@@ -43,8 +42,7 @@ 
#include <asm/gart.h>

#include <asm/dma.h>



#include "amd_iommu_proto.h"

#include "amd_iommu_types.h"

#include "amd_iommu.h"

#include "irq_remapping.h"



#define CMD_SET_TYPE(cmd, t) ((cmd)->data[1] |= ((t) << 28))

drivers/iommu/amd_iommu.h

+95 −1
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/*

 * Copyright (C) 2009-2010 Advanced Micro Devices, Inc.

 * Author: Joerg Roedel <jroedel@suse.de>

 */



#ifndef AMD_IOMMU_H

#define AMD_IOMMU_H



int __init add_special_device(u8 type, u8 id, u16 *devid, bool cmd_line);

#include <linux/iommu.h>



#include "amd_iommu_types.h"



extern int amd_iommu_get_num_iommus(void);

extern int amd_iommu_init_dma_ops(void);

extern int amd_iommu_init_passthrough(void);

extern irqreturn_t amd_iommu_int_thread(int irq, void *data);

extern irqreturn_t amd_iommu_int_handler(int irq, void *data);

extern void amd_iommu_apply_erratum_63(u16 devid);

extern void amd_iommu_reset_cmd_buffer(struct amd_iommu *iommu);

extern int amd_iommu_init_devices(void);

extern void amd_iommu_uninit_devices(void);

extern void amd_iommu_init_notifier(void);

extern int amd_iommu_init_api(void);



#ifdef CONFIG_AMD_IOMMU_DEBUGFS

void amd_iommu_debugfs_setup(struct amd_iommu *iommu);

#else

static inline void amd_iommu_debugfs_setup(struct amd_iommu *iommu) {}

#endif



/* Needed for interrupt remapping */

extern int amd_iommu_prepare(void);

extern int amd_iommu_enable(void);

extern void amd_iommu_disable(void);

extern int amd_iommu_reenable(int);

extern int amd_iommu_enable_faulting(void);

extern int amd_iommu_guest_ir;



/* IOMMUv2 specific functions */

struct iommu_domain;



extern bool amd_iommu_v2_supported(void);

extern int amd_iommu_register_ppr_notifier(struct notifier_block *nb);

extern int amd_iommu_unregister_ppr_notifier(struct notifier_block *nb);

extern void amd_iommu_domain_direct_map(struct iommu_domain *dom);

extern int amd_iommu_domain_enable_v2(struct iommu_domain *dom, int pasids);

extern int amd_iommu_flush_page(struct iommu_domain *dom, int pasid,

				u64 address);

extern int amd_iommu_flush_tlb(struct iommu_domain *dom, int pasid);

extern int amd_iommu_domain_set_gcr3(struct iommu_domain *dom, int pasid,

				     unsigned long cr3);

extern int amd_iommu_domain_clear_gcr3(struct iommu_domain *dom, int pasid);

extern struct iommu_domain *amd_iommu_get_v2_domain(struct pci_dev *pdev);



#ifdef CONFIG_IRQ_REMAP

extern int amd_iommu_create_irq_domain(struct amd_iommu *iommu);

#else

static inline int amd_iommu_create_irq_domain(struct amd_iommu *iommu)

{

	return 0;

}

#endif



#define PPR_SUCCESS			0x0

#define PPR_INVALID			0x1

#define PPR_FAILURE			0xf



extern int amd_iommu_complete_ppr(struct pci_dev *pdev, int pasid,

				  int status, int tag);



static inline bool is_rd890_iommu(struct pci_dev *pdev)

{

	return (pdev->vendor == PCI_VENDOR_ID_ATI) &&

	       (pdev->device == PCI_DEVICE_ID_RD890_IOMMU);

}



static inline bool iommu_feature(struct amd_iommu *iommu, u64 f)

{

	if (!(iommu->cap & (1 << IOMMU_CAP_EFR)))

		return false;



	return !!(iommu->features & f);

}



static inline u64 iommu_virt_to_phys(void *vaddr)

{

	return (u64)__sme_set(virt_to_phys(vaddr));

}



static inline void *iommu_phys_to_virt(unsigned long paddr)

{

	return phys_to_virt(__sme_clr(paddr));

}



extern bool translation_pre_enabled(struct amd_iommu *iommu);

extern bool amd_iommu_is_attach_deferred(struct iommu_domain *domain,

					 struct device *dev);

extern int __init add_special_device(u8 type, u8 id, u16 *devid,

				     bool cmd_line);



#ifdef CONFIG_DMI

void amd_iommu_apply_ivrs_quirks(void);

drivers/iommu/amd_iommu_debugfs.c

+2 −3
Original line number Diff line number Diff line
@@ -8,10 +8,9 @@ 
 */



#include <linux/debugfs.h>

#include <linux/iommu.h>

#include <linux/pci.h>

#include "amd_iommu_proto.h"

#include "amd_iommu_types.h"



#include "amd_iommu.h"



static struct dentry *amd_iommu_debugfs;

static DEFINE_MUTEX(amd_iommu_debugfs_lock);

drivers/iommu/amd_iommu_init.c

+1 −3
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 
#include <linux/msi.h>

#include <linux/amd-iommu.h>

#include <linux/export.h>

#include <linux/iommu.h>

#include <linux/kmemleak.h>

#include <linux/mem_encrypt.h>

#include <asm/pci-direct.h>
@@ -32,9 +31,8 @@ 
#include <asm/irq_remapping.h>



#include <linux/crash_dump.h>



#include "amd_iommu.h"

#include "amd_iommu_proto.h"

#include "amd_iommu_types.h"

#include "irq_remapping.h"



/*

drivers/iommu/amd_iommu_proto.h

deleted100644 → 0
+0 −97
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/*

 * Copyright (C) 2009-2010 Advanced Micro Devices, Inc.

 * Author: Joerg Roedel <jroedel@suse.de>

 */



#ifndef _ASM_X86_AMD_IOMMU_PROTO_H

#define _ASM_X86_AMD_IOMMU_PROTO_H



#include "amd_iommu_types.h"



extern int amd_iommu_get_num_iommus(void);

extern int amd_iommu_init_dma_ops(void);

extern int amd_iommu_init_passthrough(void);

extern irqreturn_t amd_iommu_int_thread(int irq, void *data);

extern irqreturn_t amd_iommu_int_handler(int irq, void *data);

extern void amd_iommu_apply_erratum_63(u16 devid);

extern void amd_iommu_reset_cmd_buffer(struct amd_iommu *iommu);

extern int amd_iommu_init_devices(void);

extern void amd_iommu_uninit_devices(void);

extern void amd_iommu_init_notifier(void);

extern int amd_iommu_init_api(void);



#ifdef CONFIG_AMD_IOMMU_DEBUGFS

void amd_iommu_debugfs_setup(struct amd_iommu *iommu);

#else

static inline void amd_iommu_debugfs_setup(struct amd_iommu *iommu) {}

#endif



/* Needed for interrupt remapping */

extern int amd_iommu_prepare(void);

extern int amd_iommu_enable(void);

extern void amd_iommu_disable(void);

extern int amd_iommu_reenable(int);

extern int amd_iommu_enable_faulting(void);

extern int amd_iommu_guest_ir;



/* IOMMUv2 specific functions */

struct iommu_domain;



extern bool amd_iommu_v2_supported(void);

extern int amd_iommu_register_ppr_notifier(struct notifier_block *nb);

extern int amd_iommu_unregister_ppr_notifier(struct notifier_block *nb);

extern void amd_iommu_domain_direct_map(struct iommu_domain *dom);

extern int amd_iommu_domain_enable_v2(struct iommu_domain *dom, int pasids);

extern int amd_iommu_flush_page(struct iommu_domain *dom, int pasid,

				u64 address);

extern int amd_iommu_flush_tlb(struct iommu_domain *dom, int pasid);

extern int amd_iommu_domain_set_gcr3(struct iommu_domain *dom, int pasid,

				     unsigned long cr3);

extern int amd_iommu_domain_clear_gcr3(struct iommu_domain *dom, int pasid);

extern struct iommu_domain *amd_iommu_get_v2_domain(struct pci_dev *pdev);



#ifdef CONFIG_IRQ_REMAP

extern int amd_iommu_create_irq_domain(struct amd_iommu *iommu);

#else

static inline int amd_iommu_create_irq_domain(struct amd_iommu *iommu)

{

	return 0;

}

#endif



#define PPR_SUCCESS			0x0

#define PPR_INVALID			0x1

#define PPR_FAILURE			0xf



extern int amd_iommu_complete_ppr(struct pci_dev *pdev, int pasid,

				  int status, int tag);



static inline bool is_rd890_iommu(struct pci_dev *pdev)

{

	return (pdev->vendor == PCI_VENDOR_ID_ATI) &&

	       (pdev->device == PCI_DEVICE_ID_RD890_IOMMU);

}



static inline bool iommu_feature(struct amd_iommu *iommu, u64 f)

{

	if (!(iommu->cap & (1 << IOMMU_CAP_EFR)))

		return false;



	return !!(iommu->features & f);

}



static inline u64 iommu_virt_to_phys(void *vaddr)

{

	return (u64)__sme_set(virt_to_phys(vaddr));

}



static inline void *iommu_phys_to_virt(unsigned long paddr)

{

	return phys_to_virt(__sme_clr(paddr));

}



extern bool translation_pre_enabled(struct amd_iommu *iommu);

extern bool amd_iommu_is_attach_deferred(struct iommu_domain *domain,

					 struct device *dev);

#endif /* _ASM_X86_AMD_IOMMU_PROTO_H  */

CRA Git | Maintained and supported by SUSTech CRA and CCSE