Merge tag 'v6.6.49' into rpi-6.6.49-alpine

This is the 6.6.49 stable release

Documentation/ABI/testing/sysfs-devices-system-cpu

@@ -565,7 +565,8 @@ Description: Control Symmetric Multi Threading (SMT)
  ================ =========================================
 
  If control status is "forceoff" or "notsupported" writes
- are rejected.
+ are rejected. Note that enabling SMT on PowerPC skips
+ offline cores.
 
 What: /sys/devices/system/cpu/cpuX/power/energy_perf_bias
 Date: March 2019

Makefile

@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
 VERSION = 6
 PATCHLEVEL = 6
-SUBLEVEL = 47
+SUBLEVEL = 49
 EXTRAVERSION =
 NAME = Hurr durr I'ma ninja sloth
 

arch/arm/boot/dts/nxp/imx/imx6dl-yapp43-common.dtsi

@@ -274,24 +274,24 @@
 
  led@0 {
  chan-name = "R";
- led-cur = /bits/ 8 <0x20>;
- max-cur = /bits/ 8 <0x60>;
+ led-cur = /bits/ 8 <0x6e>;
+ max-cur = /bits/ 8 <0xc8>;
  reg = <0>;
  color = <LED_COLOR_ID_RED>;
  };
 
  led@1 {
  chan-name = "G";
- led-cur = /bits/ 8 <0x20>;
- max-cur = /bits/ 8 <0x60>;
+ led-cur = /bits/ 8 <0xbe>;
+ max-cur = /bits/ 8 <0xc8>;
  reg = <1>;
  color = <LED_COLOR_ID_GREEN>;
  };
 
  led@2 {
  chan-name = "B";
- led-cur = /bits/ 8 <0x20>;
- max-cur = /bits/ 8 <0x60>;
+ led-cur = /bits/ 8 <0xbe>;
+ max-cur = /bits/ 8 <0xc8>;
  reg = <2>;
  color = <LED_COLOR_ID_BLUE>;
  };

arch/arm/boot/dts/ti/omap/omap3-n900.dts

@@ -781,7 +781,7 @@
 
  mount-matrix = "-1", "0", "0",
  "0", "1", "0",
- "0", "0", "1";
+ "0", "0", "-1";
  };
 
  cam1: camera@3e {

arch/arm64/boot/dts/freescale/imx8mp-beacon-kit.dts

@@ -163,13 +163,12 @@
 
  simple-audio-card,cpu {
  sound-dai = <&sai3>;
+ frame-master;
+ bitclock-master;
  };
 
  simple-audio-card,codec {
  sound-dai = <&wm8962>;
- clocks = <&clk IMX8MP_CLK_IPP_DO_CLKO1>;
- frame-master;
- bitclock-master;
  };
  };
 };
@@ -381,10 +380,9 @@
 &sai3 {
  pinctrl-names = "default";
  pinctrl-0 = <&pinctrl_sai3>;
- assigned-clocks = <&clk IMX8MP_CLK_SAI3>,
- <&clk IMX8MP_AUDIO_PLL2> ;
- assigned-clock-parents = <&clk IMX8MP_AUDIO_PLL2_OUT>;
- assigned-clock-rates = <12288000>, <361267200>;
+ assigned-clocks = <&clk IMX8MP_CLK_SAI3>;
+ assigned-clock-parents = <&clk IMX8MP_AUDIO_PLL1_OUT>;
+ assigned-clock-rates = <12288000>;
  fsl,sai-mclk-direction-output;
  status = "okay";
 };

arch/arm64/boot/dts/freescale/imx93-tqma9352-mba93xxla.dts

@@ -437,7 +437,7 @@
  pinctrl-0 = <&pinctrl_usdhc2_hs>, <&pinctrl_usdhc2_gpio>;
  pinctrl-1 = <&pinctrl_usdhc2_uhs>, <&pinctrl_usdhc2_gpio>;
  pinctrl-2 = <&pinctrl_usdhc2_uhs>, <&pinctrl_usdhc2_gpio>;
- cd-gpios = <&gpio3 00 GPIO_ACTIVE_LOW>;
+ cd-gpios = <&gpio3 0 GPIO_ACTIVE_LOW>;
  vmmc-supply = <&reg_usdhc2_vmmc>;
  bus-width = <4>;
  no-sdio;

arch/arm64/boot/dts/freescale/imx93-tqma9352.dtsi

@@ -19,7 +19,7 @@
  linux,cma {
  compatible = "shared-dma-pool";
  reusable;
- alloc-ranges = <0 0x60000000 0 0x40000000>;
+ alloc-ranges = <0 0x80000000 0 0x40000000>;
  size = <0 0x10000000>;
  linux,cma-default;
  };

arch/arm64/boot/dts/freescale/imx93.dtsi

@@ -786,6 +786,8 @@
  fsl,num-tx-queues = <3>;
  fsl,num-rx-queues = <3>;
  fsl,stop-mode = <&wakeupmix_gpr 0x0c 1>;
+ nvmem-cells = <&eth_mac1>;
+ nvmem-cell-names = "mac-address";
  status = "disabled";
  };
 
@@ -807,7 +809,9 @@
  <&clk IMX93_CLK_SYS_PLL_PFD0_DIV2>;
  assigned-clock-rates = <100000000>, <250000000>;
  intf_mode = <&wakeupmix_gpr 0x28>;
- snps,clk-csr = <0>;
+ snps,clk-csr = <6>;
+ nvmem-cells = <&eth_mac2>;
+ nvmem-cell-names = "mac-address";
  status = "disabled";
  };
 
@@ -888,6 +892,15 @@
  reg = <0x47510000 0x10000>;
  #address-cells = <1>;
  #size-cells = <1>;
+
+ eth_mac1: mac-address@4ec {
+ reg = <0x4ec 0x6>;
+ };
+
+ eth_mac2: mac-address@4f2 {
+ reg = <0x4f2 0x6>;
+ };
+
  };
 
  s4muap: mailbox@47520000 {

arch/arm64/kernel/acpi_numa.c

@@ -27,7 +27,7 @@
 
 #include <asm/numa.h>
 
-static int acpi_early_node_map[NR_CPUS] __initdata = { NUMA_NO_NODE };
+static int acpi_early_node_map[NR_CPUS] __initdata = { [0 ... NR_CPUS - 1] = NUMA_NO_NODE };
 
 int __init acpi_numa_get_nid(unsigned int cpu)
 {

arch/arm64/kernel/setup.c

@@ -371,9 +371,6 @@ void __init __no_sanitize_address setup_arch(char **cmdline_p)
  smp_init_cpus();
  smp_build_mpidr_hash();
 
- /* Init percpu seeds for random tags after cpus are set up. */
- kasan_init_sw_tags();
-
 #ifdef CONFIG_ARM64_SW_TTBR0_PAN
  /*
  * Make sure init_thread_info.ttbr0 always generates translation

arch/arm64/kernel/smp.c

@@ -459,6 +459,8 @@ void __init smp_prepare_boot_cpu(void)
  init_gic_priority_masking();
 
  kasan_init_hw_tags();
+ /* Init percpu seeds for random tags after cpus are set up. */
+ kasan_init_sw_tags();
 }
 
 /*

arch/arm64/kvm/sys_regs.c

@@ -32,6 +32,7 @@
 #include <trace/events/kvm.h>
 
 #include "sys_regs.h"
+#include "vgic/vgic.h"
 
 #include "trace.h"
 
@@ -301,6 +302,11 @@ static bool access_gic_sgi(struct kvm_vcpu *vcpu,
 {
  bool g1;
 
+ if (!kvm_has_gicv3(vcpu->kvm)) {
+ kvm_inject_undefined(vcpu);
+ return false;
+ }
+
  if (!p->is_write)
  return read_from_write_only(vcpu, p, r);
 

arch/arm64/kvm/vgic/vgic.h

@@ -343,4 +343,11 @@ void vgic_v4_configure_vsgis(struct kvm *kvm);
 void vgic_v4_get_vlpi_state(struct vgic_irq *irq, bool *val);
 int vgic_v4_request_vpe_irq(struct kvm_vcpu *vcpu, int irq);
 
+static inline bool kvm_has_gicv3(struct kvm *kvm)
+{
+ return (static_branch_unlikely(&kvm_vgic_global_state.gicv3_cpuif) &&
+ irqchip_in_kernel(kvm) &&
+ kvm->arch.vgic.vgic_model == KVM_DEV_TYPE_ARM_VGIC_V3);
+}
+
 #endif

arch/mips/kernel/cpu-probe.c

@@ -1725,12 +1725,16 @@ static inline void cpu_probe_loongson(struct cpuinfo_mips *c, unsigned int cpu)
  c->ases |= (MIPS_ASE_LOONGSON_MMI | MIPS_ASE_LOONGSON_CAM |
  MIPS_ASE_LOONGSON_EXT | MIPS_ASE_LOONGSON_EXT2);
  c->ases &= ~MIPS_ASE_VZ; /* VZ of Loongson-3A2000/3000 is incomplete */
+ change_c0_config6(LOONGSON_CONF6_EXTIMER | LOONGSON_CONF6_INTIMER,
+ LOONGSON_CONF6_INTIMER);
  break;
  case PRID_IMP_LOONGSON_64G:
  __cpu_name[cpu] = "ICT Loongson-3";
  set_elf_platform(cpu, "loongson3a");
  set_isa(c, MIPS_CPU_ISA_M64R2);
  decode_cpucfg(c);
+ change_c0_config6(LOONGSON_CONF6_EXTIMER | LOONGSON_CONF6_INTIMER,
+ LOONGSON_CONF6_INTIMER);
  break;
  default:
  panic("Unknown Loongson Processor ID!");

arch/openrisc/kernel/setup.c

@@ -255,6 +255,9 @@ void calibrate_delay(void)
 
 void __init setup_arch(char **cmdline_p)
 {
+ /* setup memblock allocator */
+ setup_memory();
+
  unflatten_and_copy_device_tree();
 
  setup_cpuinfo();
@@ -278,9 +281,6 @@ void __init setup_arch(char **cmdline_p)
  }
 #endif
 
- /* setup memblock allocator */
- setup_memory();
-
  /* paging_init() sets up the MMU and marks all pages as reserved */
  paging_init();
 

arch/parisc/kernel/irq.c

@@ -498,7 +498,7 @@ asmlinkage void do_cpu_irq_mask(struct pt_regs *regs)
 
  old_regs = set_irq_regs(regs);
  local_irq_disable();
- irq_enter();
+ irq_enter_rcu();
 
  eirr_val = mfctl(23) & cpu_eiem & per_cpu(local_ack_eiem, cpu);
  if (!eirr_val)
@@ -533,7 +533,7 @@ asmlinkage void do_cpu_irq_mask(struct pt_regs *regs)
 #endif /* CONFIG_IRQSTACKS */
 
  out:
- irq_exit();
+ irq_exit_rcu();
  set_irq_regs(old_regs);
  return;
 

arch/powerpc/boot/simple_alloc.c

@@ -112,8 +112,11 @@ static void *simple_realloc(void *ptr, unsigned long size)
  return ptr;
 
  new = simple_malloc(size);
- memcpy(new, ptr, p->size);
- simple_free(ptr);
+ if (new) {
+ memcpy(new, ptr, p->size);
+ simple_free(ptr);
+ }
+
  return new;
 }
 

arch/powerpc/include/asm/topology.h

@@ -145,6 +145,7 @@ static inline int cpu_to_coregroup_id(int cpu)
 
 #ifdef CONFIG_HOTPLUG_SMT
 #include <linux/cpu_smt.h>
+#include <linux/cpumask.h>
 #include <asm/cputhreads.h>
 
 static inline bool topology_is_primary_thread(unsigned int cpu)
@@ -156,6 +157,18 @@ static inline bool topology_smt_thread_allowed(unsigned int cpu)
 {
  return cpu_thread_in_core(cpu) < cpu_smt_num_threads;
 }
+
+#define topology_is_core_online topology_is_core_online
+static inline bool topology_is_core_online(unsigned int cpu)
+{
+ int i, first_cpu = cpu_first_thread_sibling(cpu);
+
+ for (i = first_cpu; i < first_cpu + threads_per_core; ++i) {
+ if (cpu_online(i))
+ return true;
+ }
+ return false;
+}
 #endif
 
 #endif /* __KERNEL__ */

arch/powerpc/platforms/pseries/papr-sysparm.c

@@ -23,6 +23,46 @@ void papr_sysparm_buf_free(struct papr_sysparm_buf *buf)
  kfree(buf);
 }
 
+static size_t papr_sysparm_buf_get_length(const struct papr_sysparm_buf *buf)
+{
+ return be16_to_cpu(buf->len);
+}
+
+static void papr_sysparm_buf_set_length(struct papr_sysparm_buf *buf, size_t length)
+{
+ WARN_ONCE(length > sizeof(buf->val),
+ "bogus length %zu, clamping to safe value", length);
+ length = min(sizeof(buf->val), length);
+ buf->len = cpu_to_be16(length);
+}
+
+/*
+ * For use on buffers returned from ibm,get-system-parameter before
+ * returning them to callers. Ensures the encoded length of valid data
+ * cannot overrun buf->val[].
+ */
+static void papr_sysparm_buf_clamp_length(struct papr_sysparm_buf *buf)
+{
+ papr_sysparm_buf_set_length(buf, papr_sysparm_buf_get_length(buf));
+}
+
+/*
+ * Perform some basic diligence on the system parameter buffer before
+ * submitting it to RTAS.
+ */
+static bool papr_sysparm_buf_can_submit(const struct papr_sysparm_buf *buf)
+{
+ /*
+ * Firmware ought to reject buffer lengths that exceed the
+ * maximum specified in PAPR, but there's no reason for the
+ * kernel to allow them either.
+ */
+ if (papr_sysparm_buf_get_length(buf) > sizeof(buf->val))
+ return false;
+
+ return true;
+}
+
 /**
  * papr_sysparm_get() - Retrieve the value of a PAPR system parameter.
  * @param: PAPR system parameter token as described in
@@ -63,6 +103,9 @@ int papr_sysparm_get(papr_sysparm_t param, struct papr_sysparm_buf *buf)
  if (token == RTAS_UNKNOWN_SERVICE)
  return -ENOENT;
 
+ if (!papr_sysparm_buf_can_submit(buf))
+ return -EINVAL;
+
  work_area = rtas_work_area_alloc(sizeof(*buf));
 
  memcpy(rtas_work_area_raw_buf(work_area), buf, sizeof(*buf));
@@ -77,6 +120,7 @@ int papr_sysparm_get(papr_sysparm_t param, struct papr_sysparm_buf *buf)
  case 0:
  ret = 0;
  memcpy(buf, rtas_work_area_raw_buf(work_area), sizeof(*buf));
+ papr_sysparm_buf_clamp_length(buf);
  break;
  case -3: /* parameter not implemented */
  ret = -EOPNOTSUPP;
@@ -115,6 +159,9 @@ int papr_sysparm_set(papr_sysparm_t param, const struct papr_sysparm_buf *buf)
  if (token == RTAS_UNKNOWN_SERVICE)
  return -ENOENT;
 
+ if (!papr_sysparm_buf_can_submit(buf))
+ return -EINVAL;
+
  work_area = rtas_work_area_alloc(sizeof(*buf));
 
  memcpy(rtas_work_area_raw_buf(work_area), buf, sizeof(*buf));

arch/powerpc/sysdev/xics/icp-native.c

@@ -236,6 +236,8 @@ static int __init icp_native_map_one_cpu(int hw_id, unsigned long addr,
  rname = kasprintf(GFP_KERNEL, "CPU %d [0x%x] Interrupt Presentation",
  cpu, hw_id);
 
+ if (!rname)
+ return -ENOMEM;
  if (!request_mem_region(addr, size, rname)) {
  pr_warn("icp_native: Could not reserve ICP MMIO for CPU %d, interrupt server #0x%x\n",
  cpu, hw_id);