4 files changed, 33 insertions, 8 deletions

diff --git a/arch/powerpc/kernel/misc_64.S b/arch/powerpc/kernel/misc_64.S
index 8ac0bd2bddb0..3280953a82cf 100644
--- a/arch/powerpc/kernel/misc_64.S
+++ b/arch/powerpc/kernel/misc_64.S
@@ -623,7 +623,9 @@ BEGIN_FTR_SECTION
          * NOTE, we rely on r0 being 0 from above.
          */
         mtspr   SPRN_IAMR,r0
+BEGIN_FTR_SECTION_NESTED(42)
         mtspr   SPRN_AMOR,r0
+END_FTR_SECTION_NESTED_IFSET(CPU_FTR_HVMODE, 42)
 END_FTR_SECTION_IFSET(CPU_FTR_ARCH_300)
 
         /* save regs for local vars on new stack.
diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
index bfdd783e3916..5acb5a176dbe 100644
--- a/arch/powerpc/kernel/process.c
+++ b/arch/powerpc/kernel/process.c
@@ -1569,16 +1569,22 @@ void arch_release_task_struct(struct task_struct *t)
  */
 int set_thread_tidr(struct task_struct *t)
 {
+        int rc;
+
         if (!cpu_has_feature(CPU_FTR_ARCH_300))
                 return -EINVAL;
 
         if (t != current)
                 return -EINVAL;
 
-        t->thread.tidr = assign_thread_tidr();
-        if (t->thread.tidr < 0)
-                return t->thread.tidr;
+        if (t->thread.tidr)
+                return 0;
+
+        rc = assign_thread_tidr();
+        if (rc < 0)
+                return rc;
 
+        t->thread.tidr = rc;
         mtspr(SPRN_TIDR, t->thread.tidr);
 
         return 0;
diff --git a/arch/powerpc/mm/hash_native_64.c b/arch/powerpc/mm/hash_native_64.c
index 3848af167df9..640cf566e986 100644
--- a/arch/powerpc/mm/hash_native_64.c
+++ b/arch/powerpc/mm/hash_native_64.c
@@ -47,7 +47,8 @@
 
 DEFINE_RAW_SPINLOCK(native_tlbie_lock);
 
-static inline void __tlbie(unsigned long vpn, int psize, int apsize, int ssize)
+static inline unsigned long  ___tlbie(unsigned long vpn, int psize,
+                                                int apsize, int ssize)
 {
         unsigned long va;
         unsigned int penc;
@@ -100,7 +101,15 @@ static inline void __tlbie(unsigned long vpn, int psize, int apsize, int ssize)
                              : "memory");
                 break;
         }
-        trace_tlbie(0, 0, va, 0, 0, 0, 0);
+        return va;
+}
+
+static inline void __tlbie(unsigned long vpn, int psize, int apsize, int ssize)
+{
+        unsigned long rb;
+
+        rb = ___tlbie(vpn, psize, apsize, ssize);
+        trace_tlbie(0, 0, rb, 0, 0, 0, 0);
 }
 
 static inline void __tlbiel(unsigned long vpn, int psize, int apsize, int ssize)
@@ -652,7 +661,7 @@ static void native_hpte_clear(void)
                 if (hpte_v & HPTE_V_VALID) {
                         hpte_decode(hptep, slot, &psize, &apsize, &ssize, &vpn);
                         hptep->v = 0;
-                        __tlbie(vpn, psize, apsize, ssize);
+                        ___tlbie(vpn, psize, apsize, ssize);
                 }
         }
 
diff --git a/drivers/misc/cxl/pci.c b/drivers/misc/cxl/pci.c
index bb7fd3f4edab..19969ee86d6f 100644
--- a/drivers/misc/cxl/pci.c
+++ b/drivers/misc/cxl/pci.c
@@ -2083,6 +2083,9 @@ static pci_ers_result_t cxl_vphb_error_detected(struct cxl_afu *afu,
         /* There should only be one entry, but go through the list
          * anyway
          */
+        if (afu->phb == NULL)
+                return result;
+
         list_for_each_entry(afu_dev, &afu->phb->bus->devices, bus_list) {
                 if (!afu_dev->driver)
                         continue;
@@ -2124,8 +2127,7 @@ static pci_ers_result_t cxl_pci_error_detected(struct pci_dev *pdev,
                          * Tell the AFU drivers; but we don't care what they
                          * say, we're going away.
                          */
-                        if (afu->phb != NULL)
-                                cxl_vphb_error_detected(afu, state);
+                        cxl_vphb_error_detected(afu, state);
                 }
                 return PCI_ERS_RESULT_DISCONNECT;
         }
@@ -2265,6 +2267,9 @@ static pci_ers_result_t cxl_pci_slot_reset(struct pci_dev *pdev)
                 if (cxl_afu_select_best_mode(afu))
                         goto err;
 
+                if (afu->phb == NULL)
+                        continue;
+
                 list_for_each_entry(afu_dev, &afu->phb->bus->devices, bus_list) {
                         /* Reset the device context.
                          * TODO: make this less disruptive
@@ -2327,6 +2332,9 @@ static void cxl_pci_resume(struct pci_dev *pdev)
         for (i = 0; i < adapter->slices; i++) {
                 afu = adapter->afu[i];
 
+                if (afu->phb == NULL)
+                        continue;
+
                 list_for_each_entry(afu_dev, &afu->phb->bus->devices, bus_list) {
                         if (afu_dev->driver && afu_dev->driver->err_handler &&
                             afu_dev->driver->err_handler->resume)