diff options
| author | Stewart Smith <stewart@linux.ibm.com> | 2018-12-12 14:49:23 +1100 |
|---|---|---|
| committer | Stewart Smith <stewart@linux.ibm.com> | 2018-12-12 14:49:23 +1100 |
| commit | eb0226273239d806f404712aacc42961130c7079 (patch) | |
| tree | 5aafaa25a1d4423545d01b75474cbc74b457295f | |
| parent | e35f1cb63c1bedd3710a3a0fa7bea9f68910fb86 (diff) | |
| download | skiboot-eb0226273239d806f404712aacc42961130c7079.zip skiboot-eb0226273239d806f404712aacc42961130c7079.tar.gz skiboot-eb0226273239d806f404712aacc42961130c7079.tar.bz2 | |
Revert "npu2: Allow ATSD for LPAR other than 0"
This reverts commit d8b161f4b361f70a7bb43be47d4a32b8f937287a.
As discussed on list, a bit premature to merge, removing for now.
Signed-off-by: Stewart Smith <stewart@linux.ibm.com>
| -rw-r--r-- | hw/npu2.c | 22 | ||||
| -rw-r--r-- | include/npu2-regs.h | 2 |
2 files changed, 4 insertions, 20 deletions
@@ -2254,14 +2254,9 @@ static int opal_npu_map_lpar(uint64_t phb_id, uint64_t bdf, uint64_t lparid, struct phb *phb = pci_get_phb(phb_id); struct npu2 *p; struct npu2_dev *ndev = NULL; - uint64_t xts_bdf_lpar, atsd_lpar, rc = OPAL_SUCCESS; + uint64_t xts_bdf_lpar, rc = OPAL_SUCCESS; int i; int id; - static uint64_t atsd_lpar_regs[] = { - NPU2_XTS_MMIO_ATSD0_LPARID, NPU2_XTS_MMIO_ATSD1_LPARID, - NPU2_XTS_MMIO_ATSD2_LPARID, NPU2_XTS_MMIO_ATSD3_LPARID, - NPU2_XTS_MMIO_ATSD4_LPARID, NPU2_XTS_MMIO_ATSD5_LPARID, - NPU2_XTS_MMIO_ATSD6_LPARID, NPU2_XTS_MMIO_ATSD7_LPARID }; if (!phb || phb->phb_type != phb_type_npu_v2) return OPAL_PARAMETER; @@ -2301,20 +2296,11 @@ static int opal_npu_map_lpar(uint64_t phb_id, uint64_t bdf, uint64_t lparid, xts_bdf_lpar = SETFIELD(NPU2_XTS_BDF_MAP_LPARID, xts_bdf_lpar, lparid); xts_bdf_lpar = SETFIELD(NPU2_XTS_BDF_MAP_LPARSHORT, xts_bdf_lpar, id); - /* - * Need to find an NVLink to send the ATSDs for this device over. - * Also, the host allocates an ATSD per NVLink, enable filtering now. - */ - atsd_lpar = SETFIELD(NPU2_XTS_MMIO_ATSD_LPARID, 0, lparid); - if (!lparid) - atsd_lpar = SETFIELD(NPU2_XTS_MMIO_ATSD_MSR_HV, atsd_lpar, 1); - + /* Need to find an NVLink to send the ATSDs for this device over */ for (i = 0; i < p->total_devices; i++) { if (p->devices[i].nvlink.gpu_bdfn == bdf) { - if (!ndev) - ndev = &p->devices[i]; - if (i < ARRAY_SIZE(atsd_lpar_regs)) - npu2_write(p, atsd_lpar_regs[i], atsd_lpar); + ndev = &p->devices[i]; + break; } } diff --git a/include/npu2-regs.h b/include/npu2-regs.h index ae5e225..8273b2b 100644 --- a/include/npu2-regs.h +++ b/include/npu2-regs.h @@ -547,8 +547,6 @@ void npu2_scom_write(uint64_t gcid, uint64_t scom_base, #define NPU2_XTS_MMIO_ATSD5_LPARID NPU2_REG_OFFSET(NPU2_STACK_MISC, NPU2_BLOCK_XTS, 0x128) #define NPU2_XTS_MMIO_ATSD6_LPARID NPU2_REG_OFFSET(NPU2_STACK_MISC, NPU2_BLOCK_XTS, 0x130) #define NPU2_XTS_MMIO_ATSD7_LPARID NPU2_REG_OFFSET(NPU2_STACK_MISC, NPU2_BLOCK_XTS, 0x138) -#define NPU2_XTS_MMIO_ATSD_MSR_HV PPC_BIT(51) -#define NPU2_XTS_MMIO_ATSD_LPARID PPC_BITMASK(52,63) #define NPU2_XTS_BDF_MAP NPU2_REG_OFFSET(NPU2_STACK_MISC, NPU2_BLOCK_XTS, 0x4000) #define NPU2_XTS_BDF_MAP_VALID PPC_BIT(0) #define NPU2_XTS_BDF_MAP_UNFILT PPC_BIT(1) |