From: Tomasz Jankowski <tomasz1.jankowski@xxxxxxxxx> Add PCI ids of Intel(R) Gaussian & Neural Accelerator on supported platforms. Signed-off-by: Tomasz Jankowski <tomasz1.jankowski@xxxxxxxxx> Tested-by: Savo Novakovic <savox.novakovic@xxxxxxxxx> Co-developed-by: Jianxun Zhang <jianxun.zhang@xxxxxxxxxxxxxxx> Signed-off-by: Jianxun Zhang <jianxun.zhang@xxxxxxxxxxxxxxx> Co-developed-by: Maciej Kwapulinski <maciej.kwapulinski@xxxxxxxxxxxxxxx> Signed-off-by: Maciej Kwapulinski <maciej.kwapulinski@xxxxxxxxxxxxxxx> --- drivers/misc/intel/gna/hw.h | 34 +++++++++++++++++++ drivers/misc/intel/gna/pci.c | 65 ++++++++++++++++++++++++++++++++++++ 2 files changed, 99 insertions(+) diff --git a/drivers/misc/intel/gna/hw.h b/drivers/misc/intel/gna/hw.h index f61792f9dd52..2a6890fb748e 100644 --- a/drivers/misc/intel/gna/hw.h +++ b/drivers/misc/intel/gna/hw.h @@ -10,6 +10,40 @@ struct gna_compute_cfg; struct gna_private; +#define GNA_FEATURES \ + .max_hw_mem = 256 * 1024 * 1024, \ + .num_pagetables = 64, \ + .num_page_entries = PAGE_SIZE / sizeof(u32), \ + /* desc_info all in bytes */ \ + .desc_info = { \ + .rsvd_size = 256, \ + .cfg_size = 256, \ + .desc_size = 784, \ + .mmu_info = { \ + .vamax_size = 4, \ + .rsvd_size = 12, \ + .pd_size = 4 * 64, \ + }, \ + } + +#define GNA_GEN1_FEATURES \ + GNA_FEATURES, \ + .max_layer_count = 1024 + +#define GNA_GEN2_FEATURES \ + GNA_FEATURES, \ + .max_layer_count = 4096 + +#define GNA_DEV_HWID_CNL 0x5A11 +#define GNA_DEV_HWID_EHL 0x4511 +#define GNA_DEV_HWID_GLK 0x3190 +#define GNA_DEV_HWID_ICL 0x8A11 +#define GNA_DEV_HWID_JSL 0x4E11 +#define GNA_DEV_HWID_TGL 0x9A11 +#define GNA_DEV_HWID_RKL 0x4C11 +#define GNA_DEV_HWID_ADL 0x464F +#define GNA_DEV_HWID_RPL 0xA74F + /* GNA MMIO registers */ #define GNA_MMIO_STS 0x80 #define GNA_MMIO_CTRL 0x84 diff --git a/drivers/misc/intel/gna/pci.c b/drivers/misc/intel/gna/pci.c index ade9076db097..525e9de9d577 100644 --- a/drivers/misc/intel/gna/pci.c +++ b/drivers/misc/intel/gna/pci.c @@ -5,8 +5,70 @@ #include <linux/pci.h> #include "device.h" +#include "hw.h" #include "pci.h" +static const struct gna_dev_info cnl_dev_info = { + .hwid = GNA_DEV_HWID_CNL, + GNA_GEN1_FEATURES +}; + +static const struct gna_dev_info glk_dev_info = { + .hwid = GNA_DEV_HWID_GLK, + GNA_GEN1_FEATURES +}; + +static const struct gna_dev_info ehl_dev_info = { + .hwid = GNA_DEV_HWID_EHL, + GNA_GEN1_FEATURES +}; + +static const struct gna_dev_info icl_dev_info = { + .hwid = GNA_DEV_HWID_ICL, + GNA_GEN1_FEATURES +}; + +static const struct gna_dev_info jsl_dev_info = { + .hwid = GNA_DEV_HWID_JSL, + GNA_GEN2_FEATURES +}; + +static const struct gna_dev_info tgl_dev_info = { + .hwid = GNA_DEV_HWID_TGL, + GNA_GEN2_FEATURES +}; + +static const struct gna_dev_info rkl_dev_info = { + .hwid = GNA_DEV_HWID_RKL, + GNA_GEN2_FEATURES +}; + +static const struct gna_dev_info adl_dev_info = { + .hwid = GNA_DEV_HWID_ADL, + GNA_GEN2_FEATURES +}; + +static const struct gna_dev_info rpl_dev_info = { + .hwid = GNA_DEV_HWID_RPL, + GNA_GEN2_FEATURES +}; + +#define INTEL_GNA_DEVICE(hwid, info) \ + { PCI_VDEVICE(INTEL, hwid), (kernel_ulong_t)(info) } + +static const struct pci_device_id gna_pci_ids[] = { + INTEL_GNA_DEVICE(GNA_DEV_HWID_CNL, &cnl_dev_info), + INTEL_GNA_DEVICE(GNA_DEV_HWID_EHL, &ehl_dev_info), + INTEL_GNA_DEVICE(GNA_DEV_HWID_GLK, &glk_dev_info), + INTEL_GNA_DEVICE(GNA_DEV_HWID_ICL, &icl_dev_info), + INTEL_GNA_DEVICE(GNA_DEV_HWID_JSL, &jsl_dev_info), + INTEL_GNA_DEVICE(GNA_DEV_HWID_TGL, &tgl_dev_info), + INTEL_GNA_DEVICE(GNA_DEV_HWID_RKL, &rkl_dev_info), + INTEL_GNA_DEVICE(GNA_DEV_HWID_ADL, &adl_dev_info), + INTEL_GNA_DEVICE(GNA_DEV_HWID_RPL, &rpl_dev_info), + { } +}; + int gna_pci_probe(struct pci_dev *pcidev, const struct pci_device_id *pci_id) { struct gna_dev_info *dev_info; @@ -42,7 +104,10 @@ int gna_pci_probe(struct pci_dev *pcidev, const struct pci_device_id *pci_id) static struct pci_driver gna_pci_driver = { .name = GNA_DV_NAME, + .id_table = gna_pci_ids, .probe = gna_pci_probe, }; module_pci_driver(gna_pci_driver); + +MODULE_DEVICE_TABLE(pci, gna_pci_ids); -- 2.28.0