Support for ODroid XU3/4 Families

Documentation/devicetree/bindings/rtc/rtc.yaml

@@ -63,6 +63,11 @@ properties:
  description:
  Enables wake up of host system on alarm.
 
+ reset-source:
+ $ref: /schemas/types.yaml#/definitions/flag
+ description:
+ The RTC is able to reset the machine.
+
 additionalProperties: true
 
 ...

Documentation/gpu/todo.rst

@@ -273,6 +273,24 @@ Contact: Daniel Vetter, Noralf Tronnes
 
 Level: Advanced
 
+Garbage collect fbdev scrolling acceleration
+--------------------------------------------
+
+Scroll acceleration is disabled in fbcon by hard-wiring p->scrollmode =
+SCROLL_REDRAW. There's a ton of code this will allow us to remove:
+- lots of code in fbcon.c
+- a bunch of the hooks in fbcon_ops, maybe the remaining hooks could be called
+ directly instead of the function table (with a switch on p->rotate)
+- fb_copyarea is unused after this, and can be deleted from all drivers
+
+Note that not all acceleration code can be deleted, since clearing and cursor
+support is still accelerated, which might be good candidates for further
+deletion projects.
+
+Contact: Daniel Vetter
+
+Level: Intermediate
+
 idr_init_base()
 ---------------
 

Makefile

@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
 VERSION = 5
 PATCHLEVEL = 10
-SUBLEVEL = 4
+SUBLEVEL = 6
 EXTRAVERSION =
 NAME = Kleptomaniac Octopus
 

arch/arm/configs/odroidxu4_defconfig

@@ -1681,9 +1681,12 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 # Firmware loader
 #
 CONFIG_FW_LOADER=y
-CONFIG_EXTRA_FIRMWARE=""
+CONFIG_FW_LOADER_PAGED_BUF=y
+CONFIG_EXTRA_FIRMWARE="edid/1024x600.bin edid/1024x768.bin edid/1152x864_75hz.bin edid/1280x1024.bin edid/1280x720.bin edid/1280x768.bin edid/1280x800.bin edid/1360x768.bin edid/1366x768.bin edid/1400x1050.bin edid/1440x900.bin edid/1600x1200.bin edid/1600x900.bin edid/1680x1050.bin edid/1792x1344.bin edid/1920x1080_23_976hz.bin edid/1920x1080_24hz.bin edid/1920x1080_50hz.bin edid/1920x1080.bin edid/1920x1200_30hz.bin edid/1920x1200_60hz.bin edid/1920x800.bin edid/480x800.bin edid/640x480.bin edid/720x480.bin edid/720x576.bin edid/800x480.bin edid/800x600.bin edid/848x480.bin edid/480x272.bin"
+CONFIG_EXTRA_FIRMWARE_DIR="firmware"
 # CONFIG_FW_LOADER_USER_HELPER is not set
-# CONFIG_FW_LOADER_COMPRESS is not set
+CONFIG_FW_LOADER_COMPRESS=y
+CONFIG_FW_CACHE=y
 # end of Firmware loader
 
 CONFIG_WANT_DEV_COREDUMP=y

arch/ia64/mm/init.c

@@ -536,7 +536,7 @@ virtual_memmap_init(u64 start, u64 end, void *arg)
 
  if (map_start < map_end)
  memmap_init_zone((unsigned long)(map_end - map_start),
- args->nid, args->zone, page_to_pfn(map_start),
+ args->nid, args->zone, page_to_pfn(map_start), page_to_pfn(map_end),
  MEMINIT_EARLY, NULL, MIGRATE_MOVABLE);
  return 0;
 }
@@ -546,7 +546,7 @@ memmap_init (unsigned long size, int nid, unsigned long zone,
  unsigned long start_pfn)
 {
  if (!vmem_map) {
- memmap_init_zone(size, nid, zone, start_pfn,
+ memmap_init_zone(size, nid, zone, start_pfn, start_pfn + size,
  MEMINIT_EARLY, NULL, MIGRATE_MOVABLE);
  } else {
  struct page *start;

arch/powerpc/kernel/irq.c

@@ -102,14 +102,6 @@ static inline notrace unsigned long get_irq_happened(void)
  return happened;
 }
 
-static inline notrace int decrementer_check_overflow(void)
-{
- u64 now = get_tb();
- u64 *next_tb = this_cpu_ptr(&decrementers_next_tb);
-
- return now >= *next_tb;
-}
-
 #ifdef CONFIG_PPC_BOOK3E
 
 /* This is called whenever we are re-enabling interrupts
@@ -142,35 +134,6 @@ notrace unsigned int __check_irq_replay(void)
  trace_hardirqs_on();
  trace_hardirqs_off();
 
- /*
- * We are always hard disabled here, but PACA_IRQ_HARD_DIS may
- * not be set, which means interrupts have only just been hard
- * disabled as part of the local_irq_restore or interrupt return
- * code. In that case, skip the decrementr check becaus it's
- * expensive to read the TB.
- *
- * HARD_DIS then gets cleared here, but it's reconciled later.
- * Either local_irq_disable will replay the interrupt and that
- * will reconcile state like other hard interrupts. Or interrupt
- * retur will replay the interrupt and in that case it sets
- * PACA_IRQ_HARD_DIS by hand (see comments in entry_64.S).
- */
- if (happened & PACA_IRQ_HARD_DIS) {
- local_paca->irq_happened &= ~PACA_IRQ_HARD_DIS;
-
- /*
- * We may have missed a decrementer interrupt if hard disabled.
- * Check the decrementer register in case we had a rollover
- * while hard disabled.
- */
- if (!(happened & PACA_IRQ_DEC)) {
- if (decrementer_check_overflow()) {
- local_paca->irq_happened |= PACA_IRQ_DEC;
- happened |= PACA_IRQ_DEC;
- }
- }
- }
-
  if (happened & PACA_IRQ_DEC) {
  local_paca->irq_happened &= ~PACA_IRQ_DEC;
  return 0x900;
@@ -186,6 +149,9 @@ notrace unsigned int __check_irq_replay(void)
  return 0x280;
  }
 
+ if (happened & PACA_IRQ_HARD_DIS)
+ local_paca->irq_happened &= ~PACA_IRQ_HARD_DIS;
+
  /* There should be nothing left ! */
  BUG_ON(local_paca->irq_happened != 0);
 
@@ -229,18 +195,6 @@ void replay_soft_interrupts(void)
  if (IS_ENABLED(CONFIG_PPC_IRQ_SOFT_MASK_DEBUG))
  WARN_ON_ONCE(mfmsr() & MSR_EE);
 
- if (happened & PACA_IRQ_HARD_DIS) {
- /*
- * We may have missed a decrementer interrupt if hard disabled.
- * Check the decrementer register in case we had a rollover
- * while hard disabled.
- */
- if (!(happened & PACA_IRQ_DEC)) {
- if (decrementer_check_overflow())
- happened |= PACA_IRQ_DEC;
- }
- }
-
  /*
  * Force the delivery of pending soft-disabled interrupts on PS3.
  * Any HV call will have this side effect.
@@ -345,6 +299,7 @@ notrace void arch_local_irq_restore(unsigned long mask)
  if (IS_ENABLED(CONFIG_PPC_IRQ_SOFT_MASK_DEBUG))
  WARN_ON_ONCE(!(mfmsr() & MSR_EE));
  __hard_irq_disable();
+ local_paca->irq_happened |= PACA_IRQ_HARD_DIS;
  } else {
  /*
  * We should already be hard disabled here. We had bugs

arch/powerpc/kernel/time.c

@@ -552,14 +552,11 @@ void timer_interrupt(struct pt_regs *regs)
  struct pt_regs *old_regs;
  u64 now;
 
- /* Some implementations of hotplug will get timer interrupts while
- * offline, just ignore these and we also need to set
- * decrementers_next_tb as MAX to make sure __check_irq_replay
- * don't replay timer interrupt when return, otherwise we'll trap
- * here infinitely :(
+ /*
+ * Some implementations of hotplug will get timer interrupts while
+ * offline, just ignore these.
  */
  if (unlikely(!cpu_online(smp_processor_id()))) {
- *next_tb = ~(u64)0;
  set_dec(decrementer_max);
  return;
  }

arch/powerpc/platforms/powernv/opal.c

@@ -731,7 +731,7 @@ int opal_hmi_exception_early2(struct pt_regs *regs)
  return 1;
 }
 
-/* HMI exception handler called in virtual mode during check_irq_replay. */
+/* HMI exception handler called in virtual mode when irqs are next enabled. */
 int opal_handle_hmi_exception(struct pt_regs *regs)
 {
  /*

arch/powerpc/sysdev/mpic_msgr.c

@@ -191,7 +191,7 @@ static int mpic_msgr_probe(struct platform_device *dev)
 
  /* IO map the message register block. */
  of_address_to_resource(np, 0, &rsrc);
- msgr_block_addr = ioremap(rsrc.start, resource_size(&rsrc));
+ msgr_block_addr = devm_ioremap(&dev->dev, rsrc.start, resource_size(&rsrc));
  if (!msgr_block_addr) {
  dev_err(&dev->dev, "Failed to iomap MPIC message registers");
  return -EFAULT;

arch/s390/kernel/entry.S

@@ -406,6 +406,7 @@ ENTRY(system_call)
  mvc __PT_PSW(16,%r11),__LC_SVC_OLD_PSW
  mvc __PT_INT_CODE(4,%r11),__LC_SVC_ILC
  stg %r14,__PT_FLAGS(%r11)
+ xc __SF_BACKCHAIN(8,%r15),__SF_BACKCHAIN(%r15)
  ENABLE_INTS
 .Lsysc_do_svc:
  # clear user controlled register to prevent speculative use
@@ -422,7 +423,6 @@ ENTRY(system_call)
  jnl .Lsysc_nr_ok
  slag %r8,%r1,3
 .Lsysc_nr_ok:
- xc __SF_BACKCHAIN(8,%r15),__SF_BACKCHAIN(%r15)
  stg %r2,__PT_ORIG_GPR2(%r11)
  stg %r7,STACK_FRAME_OVERHEAD(%r15)
  lg %r9,0(%r8,%r10) # get system call add.
@@ -712,8 +712,8 @@ ENTRY(pgm_check_handler)
  mvc __THREAD_per_address(8,%r14),__LC_PER_ADDRESS
  mvc __THREAD_per_cause(2,%r14),__LC_PER_CODE
  mvc __THREAD_per_paid(1,%r14),__LC_PER_ACCESS_ID
-6: RESTORE_SM_CLEAR_PER
- xc __SF_BACKCHAIN(8,%r15),__SF_BACKCHAIN(%r15)
+6: xc __SF_BACKCHAIN(8,%r15),__SF_BACKCHAIN(%r15)
+ RESTORE_SM_CLEAR_PER
  larl %r1,pgm_check_table
  llgh %r10,__PT_INT_CODE+2(%r11)
  nill %r10,0x007f
@@ -734,8 +734,8 @@ ENTRY(pgm_check_handler)
 # PER event in supervisor state, must be kprobes
 #
 .Lpgm_kprobe:
- RESTORE_SM_CLEAR_PER
  xc __SF_BACKCHAIN(8,%r15),__SF_BACKCHAIN(%r15)
+ RESTORE_SM_CLEAR_PER
  lgr %r2,%r11 # pass pointer to pt_regs
  brasl %r14,do_per_trap
  j .Lpgm_return
@@ -777,10 +777,10 @@ ENTRY(io_int_handler)
  stmg %r8,%r9,__PT_PSW(%r11)
  mvc __PT_INT_CODE(12,%r11),__LC_SUBCHANNEL_ID
  xc __PT_FLAGS(8,%r11),__PT_FLAGS(%r11)
+ xc __SF_BACKCHAIN(8,%r15),__SF_BACKCHAIN(%r15)
  TSTMSK __LC_CPU_FLAGS,_CIF_IGNORE_IRQ
  jo .Lio_restore
  TRACE_IRQS_OFF
- xc __SF_BACKCHAIN(8,%r15),__SF_BACKCHAIN(%r15)
 .Lio_loop:
  lgr %r2,%r11 # pass pointer to pt_regs
  lghi %r3,IO_INTERRUPT
@@ -980,10 +980,10 @@ ENTRY(ext_int_handler)
  mvc __PT_INT_PARM(4,%r11),__LC_EXT_PARAMS
  mvc __PT_INT_PARM_LONG(8,%r11),0(%r1)
  xc __PT_FLAGS(8,%r11),__PT_FLAGS(%r11)
+ xc __SF_BACKCHAIN(8,%r15),__SF_BACKCHAIN(%r15)
  TSTMSK __LC_CPU_FLAGS,_CIF_IGNORE_IRQ
  jo .Lio_restore
  TRACE_IRQS_OFF
- xc __SF_BACKCHAIN(8,%r15),__SF_BACKCHAIN(%r15)
  lgr %r2,%r11 # pass pointer to pt_regs
  lghi %r3,EXT_INTERRUPT
  brasl %r14,do_IRQ