Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc

Pull sparc fixes from David Miller:

 1) Fix panics with SR-IOV, from Babu Moger.

 2) Wire up preadv2/pwritev2.

 3) Allow proper auto-loading of VIO devices, from John Paul Adrian
    Glaubitz.

 4) Recognize Sonoma cpus, from Khalid Aziz.

 5) Fix bootup regressions caused by syscall trace fixes made recently.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  sparc64: Fix bootup regressions on some Kconfig combinations.
  sparc64: recognize and support Sonoma CPU type
  sparc: Implement and wire up vio_hotplug for vio.
  sparc: Implement and wire up modalias_show for vio.
  sparc/pci: Refactor dev_archdata initialization into pci_init_dev_archdata
  sparc/defconfigs: Remove CONFIG_IPV6_PRIVACY
  sparc: Write up preadv2/pwritev2 syscalls.
  sparc/PCI: Fix for panic while enabling SR-IOV

20 files changed, 119 insertions, 68 deletions

diff --git a/arch/sparc/configs/sparc32_defconfig b/arch/sparc/configs/sparc32_defconfig
index fb23fd6b186a..c74d3701ad68 100644
--- a/arch/sparc/configs/sparc32_defconfig
+++ b/arch/sparc/configs/sparc32_defconfig
@@ -24,7 +24,6 @@ CONFIG_INET_AH=y
 CONFIG_INET_ESP=y
 CONFIG_INET_IPCOMP=y
 # CONFIG_INET_LRO is not set
-CONFIG_IPV6_PRIVACY=y
 CONFIG_INET6_AH=m
 CONFIG_INET6_ESP=m
 CONFIG_INET6_IPCOMP=m
diff --git a/arch/sparc/configs/sparc64_defconfig b/arch/sparc/configs/sparc64_defconfig
index 04920ab8e292..3583d676a916 100644
--- a/arch/sparc/configs/sparc64_defconfig
+++ b/arch/sparc/configs/sparc64_defconfig
@@ -48,7 +48,6 @@ CONFIG_SYN_COOKIES=y
 CONFIG_INET_AH=y
 CONFIG_INET_ESP=y
 CONFIG_INET_IPCOMP=y
-CONFIG_IPV6_PRIVACY=y
 CONFIG_IPV6_ROUTER_PREF=y
 CONFIG_IPV6_ROUTE_INFO=y
 CONFIG_IPV6_OPTIMISTIC_DAD=y
diff --git a/arch/sparc/include/asm/spitfire.h b/arch/sparc/include/asm/spitfire.h
index 56f933816144..1d8321c827a8 100644
--- a/arch/sparc/include/asm/spitfire.h
+++ b/arch/sparc/include/asm/spitfire.h
@@ -48,6 +48,7 @@
 #define SUN4V_CHIP_SPARC_M6     0x06
 #define SUN4V_CHIP_SPARC_M7     0x07
 #define SUN4V_CHIP_SPARC64X     0x8a
+#define SUN4V_CHIP_SPARC_SN     0x8b
 #define SUN4V_CHIP_UNKNOWN      0xff
 
 #ifndef __ASSEMBLY__
diff --git a/arch/sparc/include/uapi/asm/unistd.h b/arch/sparc/include/uapi/asm/unistd.h
index b6de8b10a55b..36eee8132c22 100644
--- a/arch/sparc/include/uapi/asm/unistd.h
+++ b/arch/sparc/include/uapi/asm/unistd.h
@@ -423,8 +423,10 @@
 #define __NR_setsockopt         355
 #define __NR_mlock2             356
 #define __NR_copy_file_range    357
+#define __NR_preadv2            358
+#define __NR_pwritev2           359
 
-#define NR_syscalls             358
+#define NR_syscalls             360
 
 /* Bitmask values returned from kern_features system call.  */
 #define KERN_FEATURE_MIXED_MODE_STACK   0x00000001
diff --git a/arch/sparc/kernel/cherrs.S b/arch/sparc/kernel/cherrs.S
index 4ee1ad420862..655628def68e 100644
--- a/arch/sparc/kernel/cherrs.S
+++ b/arch/sparc/kernel/cherrs.S
@@ -214,8 +214,7 @@ do_dcpe_tl1_nonfatal:	/* Ok we may use interrupt globals safely. */
         subcc           %g1, %g2, %g1           ! Next cacheline
         bge,pt          %icc, 1b
          nop
-        ba,pt           %xcc, dcpe_icpe_tl1_common
-         nop
+        ba,a,pt         %xcc, dcpe_icpe_tl1_common
 
 do_dcpe_tl1_fatal:
         sethi           %hi(1f), %g7
@@ -224,8 +223,7 @@ do_dcpe_tl1_fatal:
         mov             0x2, %o0
         call            cheetah_plus_parity_error
          add            %sp, PTREGS_OFF, %o1
-        ba,pt           %xcc, rtrap
-         nop
+        ba,a,pt         %xcc, rtrap
         .size           do_dcpe_tl1,.-do_dcpe_tl1
 
         .globl          do_icpe_tl1
@@ -259,8 +257,7 @@ do_icpe_tl1_nonfatal:	/* Ok we may use interrupt globals safely. */
         subcc           %g1, %g2, %g1
         bge,pt          %icc, 1b
          nop
-        ba,pt           %xcc, dcpe_icpe_tl1_common
-         nop
+        ba,a,pt         %xcc, dcpe_icpe_tl1_common
 
 do_icpe_tl1_fatal:
         sethi           %hi(1f), %g7
@@ -269,8 +266,7 @@ do_icpe_tl1_fatal:
         mov             0x3, %o0
         call            cheetah_plus_parity_error
          add            %sp, PTREGS_OFF, %o1
-        ba,pt           %xcc, rtrap
-         nop
+        ba,a,pt         %xcc, rtrap
         .size           do_icpe_tl1,.-do_icpe_tl1
         
         .type           dcpe_icpe_tl1_common,#function
@@ -456,7 +452,7 @@ __cheetah_log_error:
          cmp            %g2, 0x63
         be              c_cee
          nop
-        ba,pt           %xcc, c_deferred
+        ba,a,pt         %xcc, c_deferred
         .size           __cheetah_log_error,.-__cheetah_log_error
 
         /* Cheetah FECC trap handling, we get here from tl{0,1}_fecc
diff --git a/arch/sparc/kernel/cpu.c b/arch/sparc/kernel/cpu.c
index dfad8b1aea9f..493e023a468a 100644
--- a/arch/sparc/kernel/cpu.c
+++ b/arch/sparc/kernel/cpu.c
@@ -506,6 +506,12 @@ static void __init sun4v_cpu_probe(void)
                 sparc_pmu_type = "sparc-m7";
                 break;
 
+        case SUN4V_CHIP_SPARC_SN:
+                sparc_cpu_type = "SPARC-SN";
+                sparc_fpu_type = "SPARC-SN integrated FPU";
+                sparc_pmu_type = "sparc-sn";
+                break;
+
         case SUN4V_CHIP_SPARC64X:
                 sparc_cpu_type = "SPARC64-X";
                 sparc_fpu_type = "SPARC64-X integrated FPU";
diff --git a/arch/sparc/kernel/cpumap.c b/arch/sparc/kernel/cpumap.c
index e69ec0e3f155..45c820e1cba5 100644
--- a/arch/sparc/kernel/cpumap.c
+++ b/arch/sparc/kernel/cpumap.c
@@ -328,6 +328,7 @@ static int iterate_cpu(struct cpuinfo_tree *t, unsigned int root_index)
         case SUN4V_CHIP_NIAGARA5:
         case SUN4V_CHIP_SPARC_M6:
         case SUN4V_CHIP_SPARC_M7:
+        case SUN4V_CHIP_SPARC_SN:
         case SUN4V_CHIP_SPARC64X:
                 rover_inc_table = niagara_iterate_method;
                 break;
diff --git a/arch/sparc/kernel/fpu_traps.S b/arch/sparc/kernel/fpu_traps.S
index a6864826a4bd..336d2750fe78 100644
--- a/arch/sparc/kernel/fpu_traps.S
+++ b/arch/sparc/kernel/fpu_traps.S
@@ -100,8 +100,8 @@ do_fpdis:
         fmuld           %f0, %f2, %f26
         faddd           %f0, %f2, %f28
         fmuld           %f0, %f2, %f30
-        b,pt            %xcc, fpdis_exit
-         nop
+        ba,a,pt         %xcc, fpdis_exit
+
 2:      andcc           %g5, FPRS_DU, %g0
         bne,pt          %icc, 3f
          fzero          %f32
@@ -144,8 +144,8 @@ do_fpdis:
         fmuld           %f32, %f34, %f58
         faddd           %f32, %f34, %f60
         fmuld           %f32, %f34, %f62
-        ba,pt           %xcc, fpdis_exit
-         nop
+        ba,a,pt         %xcc, fpdis_exit
+
 3:      mov             SECONDARY_CONTEXT, %g3
         add             %g6, TI_FPREGS, %g1
 
@@ -197,8 +197,7 @@ fpdis_exit2:
 fp_other_bounce:
         call            do_fpother
          add            %sp, PTREGS_OFF, %o0
-        ba,pt           %xcc, rtrap
-         nop
+        ba,a,pt         %xcc, rtrap
         .size           fp_other_bounce,.-fp_other_bounce
 
         .align          32
diff --git a/arch/sparc/kernel/head_64.S b/arch/sparc/kernel/head_64.S
index cd1f592cd347..a076b4249e62 100644
--- a/arch/sparc/kernel/head_64.S
+++ b/arch/sparc/kernel/head_64.S
@@ -414,6 +414,8 @@ sun4v_chip_type:
         cmp     %g2, 'T'
         be,pt   %xcc, 70f
          cmp    %g2, 'M'
+        be,pt   %xcc, 70f
+         cmp    %g2, 'S'
         bne,pn  %xcc, 49f
          nop
 
@@ -433,6 +435,9 @@ sun4v_chip_type:
         cmp     %g2, '7'
         be,pt   %xcc, 5f
          mov    SUN4V_CHIP_SPARC_M7, %g4
+        cmp     %g2, 'N'
+        be,pt   %xcc, 5f
+         mov    SUN4V_CHIP_SPARC_SN, %g4
         ba,pt   %xcc, 49f
          nop
 
@@ -461,9 +466,8 @@ sun4v_chip_type:
         subcc   %g3, 1, %g3
         bne,pt  %xcc, 41b
         add     %g1, 1, %g1
-        mov     SUN4V_CHIP_SPARC64X, %g4
         ba,pt   %xcc, 5f
-        nop
+         mov    SUN4V_CHIP_SPARC64X, %g4
 
 49:
         mov     SUN4V_CHIP_UNKNOWN, %g4
@@ -548,8 +552,7 @@ sun4u_init:
         stxa            %g0, [%g7] ASI_DMMU
         membar  #Sync
 
-        ba,pt           %xcc, sun4u_continue
-         nop
+        ba,a,pt         %xcc, sun4u_continue
 
 sun4v_init:
         /* Set ctx 0 */
@@ -560,14 +563,12 @@ sun4v_init:
         mov             SECONDARY_CONTEXT, %g7
         stxa            %g0, [%g7] ASI_MMU
         membar          #Sync
-        ba,pt           %xcc, niagara_tlb_fixup
-         nop
+        ba,a,pt         %xcc, niagara_tlb_fixup
 
 sun4u_continue:
         BRANCH_IF_ANY_CHEETAH(g1, g7, cheetah_tlb_fixup)
 
-        ba,pt   %xcc, spitfire_tlb_fixup
-         nop
+        ba,a,pt %xcc, spitfire_tlb_fixup
 
 niagara_tlb_fixup:
         mov     3, %g2          /* Set TLB type to hypervisor. */
@@ -597,6 +598,9 @@ niagara_tlb_fixup:
         cmp     %g1, SUN4V_CHIP_SPARC_M7
         be,pt   %xcc, niagara4_patch
          nop
+        cmp     %g1, SUN4V_CHIP_SPARC_SN
+        be,pt   %xcc, niagara4_patch
+         nop
 
         call    generic_patch_copyops
          nop
@@ -639,8 +643,7 @@ niagara_patch:
         call    hypervisor_patch_cachetlbops
          nop
 
-        ba,pt   %xcc, tlb_fixup_done
-         nop
+        ba,a,pt %xcc, tlb_fixup_done
 
 cheetah_tlb_fixup:
         mov     2, %g2          /* Set TLB type to cheetah+. */
@@ -659,8 +662,7 @@ cheetah_tlb_fixup:
         call    cheetah_patch_cachetlbops
          nop
 
-        ba,pt   %xcc, tlb_fixup_done
-         nop
+        ba,a,pt %xcc, tlb_fixup_done
 
 spitfire_tlb_fixup:
         /* Set TLB type to spitfire. */
@@ -774,8 +776,7 @@ setup_trap_table:
         call    %o1
          add    %sp, (2047 + 128), %o0
 
-        ba,pt   %xcc, 2f
-         nop
+        ba,a,pt %xcc, 2f
 
 1:      sethi   %hi(sparc64_ttable_tl0), %o0
         set     prom_set_trap_table_name, %g2
@@ -814,8 +815,7 @@ setup_trap_table:
 
         BRANCH_IF_ANY_CHEETAH(o2, o3, 1f)
 
-        ba,pt   %xcc, 2f
-         nop
+        ba,a,pt %xcc, 2f
 
         /* Disable STICK_INT interrupts. */
 1:
diff --git a/arch/sparc/kernel/misctrap.S b/arch/sparc/kernel/misctrap.S
index 753b4f031bfb..34b4933900bf 100644
--- a/arch/sparc/kernel/misctrap.S
+++ b/arch/sparc/kernel/misctrap.S
@@ -18,8 +18,7 @@ __do_privact:
 109:    or              %g7, %lo(109b), %g7
         call            do_privact
          add            %sp, PTREGS_OFF, %o0
-        ba,pt           %xcc, rtrap
-         nop
+        ba,a,pt         %xcc, rtrap
         .size           __do_privact,.-__do_privact
 
         .type           do_mna,#function
@@ -46,8 +45,7 @@ do_mna:
         mov             %l5, %o2
         call            mem_address_unaligned
          add            %sp, PTREGS_OFF, %o0
-        ba,pt           %xcc, rtrap
-         nop
+        ba,a,pt         %xcc, rtrap
         .size           do_mna,.-do_mna
 
         .type           do_lddfmna,#function
@@ -65,8 +63,7 @@ do_lddfmna:
         mov             %l5, %o2
         call            handle_lddfmna
          add            %sp, PTREGS_OFF, %o0
-        ba,pt           %xcc, rtrap
-         nop
+        ba,a,pt         %xcc, rtrap
         .size           do_lddfmna,.-do_lddfmna
 
         .type           do_stdfmna,#function
@@ -84,8 +81,7 @@ do_stdfmna:
         mov             %l5, %o2
         call            handle_stdfmna
          add            %sp, PTREGS_OFF, %o0
-        ba,pt           %xcc, rtrap
-         nop
+        ba,a,pt         %xcc, rtrap
         .size           do_stdfmna,.-do_stdfmna
 
         .type           breakpoint_trap,#function
diff --git a/arch/sparc/kernel/pci.c b/arch/sparc/kernel/pci.c
index badf0951d73c..c2b202d763a1 100644
--- a/arch/sparc/kernel/pci.c
+++ b/arch/sparc/kernel/pci.c
@@ -245,6 +245,18 @@ static void pci_parse_of_addrs(struct platform_device *op,
         }
 }
 
+static void pci_init_dev_archdata(struct dev_archdata *sd, void *iommu,
+                                  void *stc, void *host_controller,
+                                  struct platform_device  *op,
+                                  int numa_node)
+{
+        sd->iommu = iommu;
+        sd->stc = stc;
+        sd->host_controller = host_controller;
+        sd->op = op;
+        sd->numa_node = numa_node;
+}
+
 static struct pci_dev *of_create_pci_dev(struct pci_pbm_info *pbm,
                                          struct device_node *node,
                                          struct pci_bus *bus, int devfn)
@@ -259,13 +271,10 @@ static struct pci_dev *of_create_pci_dev(struct pci_pbm_info *pbm,
         if (!dev)
                 return NULL;
 
+        op = of_find_device_by_node(node);
         sd = &dev->dev.archdata;
-        sd->iommu = pbm->iommu;
-        sd->stc = &pbm->stc;
-        sd->host_controller = pbm;
-        sd->op = op = of_find_device_by_node(node);
-        sd->numa_node = pbm->numa_node;
-
+        pci_init_dev_archdata(sd, pbm->iommu, &pbm->stc, pbm, op,
+                              pbm->numa_node);
         sd = &op->dev.archdata;
         sd->iommu = pbm->iommu;
         sd->stc = &pbm->stc;
@@ -994,6 +1003,27 @@ void pcibios_set_master(struct pci_dev *dev)
         /* No special bus mastering setup handling */
 }
 
+#ifdef CONFIG_PCI_IOV
+int pcibios_add_device(struct pci_dev *dev)
+{
+        struct pci_dev *pdev;
+
+        /* Add sriov arch specific initialization here.
+         * Copy dev_archdata from PF to VF
+         */
+        if (dev->is_virtfn) {
+                struct dev_archdata *psd;
+
+                pdev = dev->physfn;
+                psd = &pdev->dev.archdata;
+                pci_init_dev_archdata(&dev->dev.archdata, psd->iommu,
+                                      psd->stc, psd->host_controller, NULL,
+                                      psd->numa_node);
+        }
+        return 0;
+}
+#endif /* CONFIG_PCI_IOV */
+
 static int __init pcibios_init(void)
 {
         pci_dfl_cache_line_size = 64 >> 2;
diff --git a/arch/sparc/kernel/setup_64.c b/arch/sparc/kernel/setup_64.c
index 26db95b54ee9..599f1207eed2 100644
--- a/arch/sparc/kernel/setup_64.c
+++ b/arch/sparc/kernel/setup_64.c
@@ -285,7 +285,8 @@ static void __init sun4v_patch(void)
 
         sun4v_patch_2insn_range(&__sun4v_2insn_patch,
                                 &__sun4v_2insn_patch_end);
-        if (sun4v_chip_type == SUN4V_CHIP_SPARC_M7)
+        if (sun4v_chip_type == SUN4V_CHIP_SPARC_M7 ||
+            sun4v_chip_type == SUN4V_CHIP_SPARC_SN)
                 sun_m7_patch_2insn_range(&__sun_m7_2insn_patch,
                                          &__sun_m7_2insn_patch_end);
 
@@ -524,6 +525,7 @@ static void __init init_sparc64_elf_hwcap(void)
                     sun4v_chip_type == SUN4V_CHIP_NIAGARA5 ||
                     sun4v_chip_type == SUN4V_CHIP_SPARC_M6 ||
                     sun4v_chip_type == SUN4V_CHIP_SPARC_M7 ||
+                    sun4v_chip_type == SUN4V_CHIP_SPARC_SN ||
                     sun4v_chip_type == SUN4V_CHIP_SPARC64X)
                         cap |= HWCAP_SPARC_BLKINIT;
                 if (sun4v_chip_type == SUN4V_CHIP_NIAGARA2 ||
@@ -532,6 +534,7 @@ static void __init init_sparc64_elf_hwcap(void)
                     sun4v_chip_type == SUN4V_CHIP_NIAGARA5 ||
                     sun4v_chip_type == SUN4V_CHIP_SPARC_M6 ||
                     sun4v_chip_type == SUN4V_CHIP_SPARC_M7 ||
+                    sun4v_chip_type == SUN4V_CHIP_SPARC_SN ||
                     sun4v_chip_type == SUN4V_CHIP_SPARC64X)
                         cap |= HWCAP_SPARC_N2;
         }
@@ -561,6 +564,7 @@ static void __init init_sparc64_elf_hwcap(void)
                             sun4v_chip_type == SUN4V_CHIP_NIAGARA5 ||
                             sun4v_chip_type == SUN4V_CHIP_SPARC_M6 ||
                             sun4v_chip_type == SUN4V_CHIP_SPARC_M7 ||
+                            sun4v_chip_type == SUN4V_CHIP_SPARC_SN ||
                             sun4v_chip_type == SUN4V_CHIP_SPARC64X)
                                 cap |= (AV_SPARC_VIS | AV_SPARC_VIS2 |
                                         AV_SPARC_ASI_BLK_INIT |
@@ -570,6 +574,7 @@ static void __init init_sparc64_elf_hwcap(void)
                             sun4v_chip_type == SUN4V_CHIP_NIAGARA5 ||
                             sun4v_chip_type == SUN4V_CHIP_SPARC_M6 ||
                             sun4v_chip_type == SUN4V_CHIP_SPARC_M7 ||
+                            sun4v_chip_type == SUN4V_CHIP_SPARC_SN ||
                             sun4v_chip_type == SUN4V_CHIP_SPARC64X)
                                 cap |= (AV_SPARC_VIS3 | AV_SPARC_HPC |
                                         AV_SPARC_FMAF);
diff --git a/arch/sparc/kernel/spiterrs.S b/arch/sparc/kernel/spiterrs.S
index c357e40ffd01..4a73009f66a5 100644
--- a/arch/sparc/kernel/spiterrs.S
+++ b/arch/sparc/kernel/spiterrs.S
@@ -85,8 +85,7 @@ __spitfire_cee_trap_continue:
         ba,pt           %xcc, etraptl1
          rd             %pc, %g7
 
-        ba,pt           %xcc, 2f
-         nop
+        ba,a,pt         %xcc, 2f
 
 1:      ba,pt           %xcc, etrap_irq
          rd             %pc, %g7
@@ -100,8 +99,7 @@ __spitfire_cee_trap_continue:
         mov             %l5, %o2
         call            spitfire_access_error
          add            %sp, PTREGS_OFF, %o0
-        ba,pt           %xcc, rtrap
-         nop
+        ba,a,pt         %xcc, rtrap
         .size           __spitfire_access_error,.-__spitfire_access_error
 
         /* This is the trap handler entry point for ECC correctable
@@ -179,8 +177,7 @@ __spitfire_data_access_exception_tl1:
         mov             %l5, %o2
         call            spitfire_data_access_exception_tl1
          add            %sp, PTREGS_OFF, %o0
-        ba,pt           %xcc, rtrap
-         nop
+        ba,a,pt         %xcc, rtrap
         .size           __spitfire_data_access_exception_tl1,.-__spitfire_data_access_exception_tl1
 
         .type           __spitfire_data_access_exception,#function
@@ -200,8 +197,7 @@ __spitfire_data_access_exception:
         mov             %l5, %o2
         call            spitfire_data_access_exception
          add            %sp, PTREGS_OFF, %o0
-        ba,pt           %xcc, rtrap
-         nop
+        ba,a,pt         %xcc, rtrap
         .size           __spitfire_data_access_exception,.-__spitfire_data_access_exception
 
         .type           __spitfire_insn_access_exception_tl1,#function
@@ -220,8 +216,7 @@ __spitfire_insn_access_exception_tl1:
         mov             %l5, %o2
         call            spitfire_insn_access_exception_tl1
          add            %sp, PTREGS_OFF, %o0
-        ba,pt           %xcc, rtrap
-         nop
+        ba,a,pt         %xcc, rtrap
         .size           __spitfire_insn_access_exception_tl1,.-__spitfire_insn_access_exception_tl1
 
         .type           __spitfire_insn_access_exception,#function
@@ -240,6 +235,5 @@ __spitfire_insn_access_exception:
         mov             %l5, %o2
         call            spitfire_insn_access_exception
          add            %sp, PTREGS_OFF, %o0
-        ba,pt           %xcc, rtrap
-         nop
+        ba,a,pt         %xcc, rtrap
         .size           __spitfire_insn_access_exception,.-__spitfire_insn_access_exception
diff --git a/arch/sparc/kernel/systbls_32.S b/arch/sparc/kernel/systbls_32.S
index 6c3dd6c52f8b..eac7f0db5c8c 100644
--- a/arch/sparc/kernel/systbls_32.S
+++ b/arch/sparc/kernel/systbls_32.S
@@ -88,4 +88,4 @@ sys_call_table:
 /*340*/ .long sys_ni_syscall, sys_kcmp, sys_finit_module, sys_sched_setattr, sys_sched_getattr
 /*345*/ .long sys_renameat2, sys_seccomp, sys_getrandom, sys_memfd_create, sys_bpf
 /*350*/ .long sys_execveat, sys_membarrier, sys_userfaultfd, sys_bind, sys_listen
-/*355*/ .long sys_setsockopt, sys_mlock2, sys_copy_file_range
+/*355*/ .long sys_setsockopt, sys_mlock2, sys_copy_file_range, sys_preadv2, sys_pwritev2
diff --git a/arch/sparc/kernel/systbls_64.S b/arch/sparc/kernel/systbls_64.S
index 12b524cfcfa0..b0f17ff2ddba 100644
--- a/arch/sparc/kernel/systbls_64.S
+++ b/arch/sparc/kernel/systbls_64.S
@@ -89,7 +89,7 @@ sys_call_table32:
 /*340*/ .word sys_kern_features, sys_kcmp, sys_finit_module, sys_sched_setattr, sys_sched_getattr
         .word sys32_renameat2, sys_seccomp, sys_getrandom, sys_memfd_create, sys_bpf
 /*350*/ .word sys32_execveat, sys_membarrier, sys_userfaultfd, sys_bind, sys_listen
-        .word compat_sys_setsockopt, sys_mlock2, sys_copy_file_range
+        .word compat_sys_setsockopt, sys_mlock2, sys_copy_file_range, compat_sys_preadv2, compat_sys_pwritev2
 
 #endif /* CONFIG_COMPAT */
 
@@ -170,4 +170,4 @@ sys_call_table:
 /*340*/ .word sys_kern_features, sys_kcmp, sys_finit_module, sys_sched_setattr, sys_sched_getattr
         .word sys_renameat2, sys_seccomp, sys_getrandom, sys_memfd_create, sys_bpf
 /*350*/ .word sys64_execveat, sys_membarrier, sys_userfaultfd, sys_bind, sys_listen
-        .word sys_setsockopt, sys_mlock2, sys_copy_file_range
+        .word sys_setsockopt, sys_mlock2, sys_copy_file_range, sys_preadv2, sys_pwritev2
diff --git a/arch/sparc/kernel/utrap.S b/arch/sparc/kernel/utrap.S
index b7f0f3f3a909..c731e8023d3e 100644
--- a/arch/sparc/kernel/utrap.S
+++ b/arch/sparc/kernel/utrap.S
@@ -11,8 +11,7 @@ utrap_trap:		/* %g3=handler,%g4=level */
         mov             %l4, %o1
         call            bad_trap
          add            %sp, PTREGS_OFF, %o0
-        ba,pt           %xcc, rtrap
-         nop
+        ba,a,pt         %xcc, rtrap
 
 invoke_utrap:
         sllx            %g3, 3, %g3
diff --git a/arch/sparc/kernel/vio.c b/arch/sparc/kernel/vio.c
index cb5789c9f961..f6bb857254fc 100644
--- a/arch/sparc/kernel/vio.c
+++ b/arch/sparc/kernel/vio.c
@@ -45,6 +45,14 @@ static const struct vio_device_id *vio_match_device(
         return NULL;
 }
 
+static int vio_hotplug(struct device *dev, struct kobj_uevent_env *env)
+{
+        const struct vio_dev *vio_dev = to_vio_dev(dev);
+
+        add_uevent_var(env, "MODALIAS=vio:T%sS%s", vio_dev->type, vio_dev->compat);
+        return 0;
+}
+
 static int vio_bus_match(struct device *dev, struct device_driver *drv)
 {
         struct vio_dev *vio_dev = to_vio_dev(dev);
@@ -105,15 +113,25 @@ static ssize_t type_show(struct device *dev,
         return sprintf(buf, "%s\n", vdev->type);
 }
 
+static ssize_t modalias_show(struct device *dev, struct device_attribute *attr,
+                             char *buf)
+{
+        const struct vio_dev *vdev = to_vio_dev(dev);
+
+        return sprintf(buf, "vio:T%sS%s\n", vdev->type, vdev->compat);
+}
+
 static struct device_attribute vio_dev_attrs[] = {
         __ATTR_RO(devspec),
         __ATTR_RO(type),
+        __ATTR_RO(modalias),
         __ATTR_NULL
 };
 
 static struct bus_type vio_bus_type = {
         .name           = "vio",
         .dev_attrs      = vio_dev_attrs,
+        .uevent         = vio_hotplug,
         .match          = vio_bus_match,
         .probe          = vio_device_probe,
         .remove         = vio_device_remove,
diff --git a/arch/sparc/kernel/vmlinux.lds.S b/arch/sparc/kernel/vmlinux.lds.S
index aadd321aa05d..7d02b1fef025 100644
--- a/arch/sparc/kernel/vmlinux.lds.S
+++ b/arch/sparc/kernel/vmlinux.lds.S
@@ -33,6 +33,10 @@ ENTRY(_start)
 jiffies = jiffies_64;
 #endif
 
+#ifdef CONFIG_SPARC64
+ASSERT((swapper_tsb == 0x0000000000408000), "Error: sparc64 early assembler too large")
+#endif
+
 SECTIONS
 {
 #ifdef CONFIG_SPARC64
diff --git a/arch/sparc/kernel/winfixup.S b/arch/sparc/kernel/winfixup.S
index 1e67ce958369..855019a8590e 100644
--- a/arch/sparc/kernel/winfixup.S
+++ b/arch/sparc/kernel/winfixup.S
@@ -32,8 +32,7 @@ fill_fixup:
          rd     %pc, %g7
         call    do_sparc64_fault
          add    %sp, PTREGS_OFF, %o0
-        ba,pt   %xcc, rtrap
-         nop
+        ba,a,pt %xcc, rtrap
 
         /* Be very careful about usage of the trap globals here.
          * You cannot touch %g5 as that has the fault information.
diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c
index 1cfe6aab7a11..09e838801e39 100644
--- a/arch/sparc/mm/init_64.c
+++ b/arch/sparc/mm/init_64.c
@@ -1769,6 +1769,7 @@ static void __init setup_page_offset(void)
                         max_phys_bits = 47;
                         break;
                 case SUN4V_CHIP_SPARC_M7:
+                case SUN4V_CHIP_SPARC_SN:
                 default:
                         /* M7 and later support 52-bit virtual addresses.  */
                         sparc64_va_hole_top =    0xfff8000000000000UL;
@@ -1986,6 +1987,7 @@ static void __init sun4v_linear_pte_xor_finalize(void)
          */
         switch (sun4v_chip_type) {
         case SUN4V_CHIP_SPARC_M7:
+        case SUN4V_CHIP_SPARC_SN:
                 pagecv_flag = 0x00;
                 break;
         default:
@@ -2138,6 +2140,7 @@ void __init paging_init(void)
          */
         switch (sun4v_chip_type) {
         case SUN4V_CHIP_SPARC_M7:
+        case SUN4V_CHIP_SPARC_SN:
                 page_cache4v_flag = _PAGE_CP_4V;
                 break;
         default: