Merge branch '7.0/fixes' into 7.0/base

Author: 1Naim

arch/x86/kernel/cpu/amd.c

@@ -1032,11 +1032,8 @@ static const struct x86_cpu_id zen5_rdseed_microcode[] = {
 
 static void init_amd_zen5(struct cpuinfo_x86 *c)
 {
-	if (!x86_match_min_microcode_rev(zen5_rdseed_microcode)) {
-		clear_cpu_cap(c, X86_FEATURE_RDSEED);
-		msr_clear_bit(MSR_AMD64_CPUID_FN_7, 18);
-		pr_emerg_once("RDSEED32 is broken. Disabling the corresponding CPUID bit.\n");
-	}
+	if (!x86_match_min_microcode_rev(zen5_rdseed_microcode))
+		pr_emerg_once("RDSEED32 is broken. Please update your firmware.\n");
 }
 
 static void init_amd(struct cpuinfo_x86 *c)

include/linux/clockchips.h

@@ -80,7 +80,6 @@ enum clock_event_state {
  * @shift:		nanoseconds to cycles divisor (power of two)
  * @state_use_accessors:current state of the device, assigned by the core code
  * @features:		features
- * @next_event_forced:	True if the last programming was a forced event
  * @retries:		number of forced programming retries
  * @set_state_periodic:	switch state to periodic
  * @set_state_oneshot:	switch state to oneshot
@@ -109,7 +108,6 @@ struct clock_event_device {
 	u32			shift;
 	enum clock_event_state	state_use_accessors;
 	unsigned int		features;
-	unsigned int		next_event_forced;
 	unsigned long		retries;
 
 	int			(*set_state_periodic)(struct clock_event_device *);

kernel/time/clockevents.c

@@ -172,7 +172,6 @@ void clockevents_shutdown(struct clock_event_device *dev)
 {
 	clockevents_switch_state(dev, CLOCK_EVT_STATE_SHUTDOWN);
 	dev->next_event = KTIME_MAX;
-	dev->next_event_forced = 0;
 }
 
 /**
@@ -306,6 +305,7 @@ int clockevents_program_event(struct clock_event_device *dev, ktime_t expires,
 {
 	unsigned long long clc;
 	int64_t delta;
+	int rc;
 
 	if (WARN_ON_ONCE(expires < 0))
 		return -ETIME;
@@ -324,27 +324,16 @@ int clockevents_program_event(struct clock_event_device *dev, ktime_t expires,
 		return dev->set_next_ktime(expires, dev);
 
 	delta = ktime_to_ns(ktime_sub(expires, ktime_get()));
+	if (delta <= 0)
+		return force ? clockevents_program_min_delta(dev) : -ETIME;
 
-	/* Required for tick_periodic() during early boot */
-	if (delta <= 0 && !force)
-		return -ETIME;
-
-	if (delta > (int64_t)dev->min_delta_ns) {
-		delta = min(delta, (int64_t) dev->max_delta_ns);
-		clc = ((unsigned long long) delta * dev->mult) >> dev->shift;
-		if (!dev->set_next_event((unsigned long) clc, dev))
-			return 0;
-	}
+	delta = min(delta, (int64_t) dev->max_delta_ns);
+	delta = max(delta, (int64_t) dev->min_delta_ns);
 
-	if (dev->next_event_forced)
-		return 0;
+	clc = ((unsigned long long) delta * dev->mult) >> dev->shift;
+	rc = dev->set_next_event((unsigned long) clc, dev);
 
-	if (dev->set_next_event(dev->min_delta_ticks, dev)) {
-		if (!force || clockevents_program_min_delta(dev))
-			return -ETIME;
-	}
-	dev->next_event_forced = 1;
-	return 0;
+	return (rc && force) ? clockevents_program_min_delta(dev) : rc;
 }
 
 /*

kernel/time/hrtimer.c

@@ -1888,7 +1888,6 @@ void hrtimer_interrupt(struct clock_event_device *dev)
 	BUG_ON(!cpu_base->hres_active);
 	cpu_base->nr_events++;
 	dev->next_event = KTIME_MAX;
-	dev->next_event_forced = 0;
 
 	raw_spin_lock_irqsave(&cpu_base->lock, flags);
 	entry_time = now = hrtimer_update_base(cpu_base);

kernel/time/tick-broadcast.c

@@ -76,10 +76,8 @@ const struct clock_event_device *tick_get_wakeup_device(int cpu)
  */
 static void tick_broadcast_start_periodic(struct clock_event_device *bc)
 {
-	if (bc) {
-		bc->next_event_forced = 0;
+	if (bc)
 		tick_setup_periodic(bc, 1);
-	}
 }
 
 /*
@@ -405,7 +403,6 @@ static void tick_handle_periodic_broadcast(struct clock_event_device *dev)
 	bool bc_local;
 
 	raw_spin_lock(&tick_broadcast_lock);
-	tick_broadcast_device.evtdev->next_event_forced = 0;
 
 	/* Handle spurious interrupts gracefully */
 	if (clockevent_state_shutdown(tick_broadcast_device.evtdev)) {
@@ -699,7 +696,6 @@ static void tick_handle_oneshot_broadcast(struct clock_event_device *dev)
 
 	raw_spin_lock(&tick_broadcast_lock);
 	dev->next_event = KTIME_MAX;
-	tick_broadcast_device.evtdev->next_event_forced = 0;
 	next_event = KTIME_MAX;
 	cpumask_clear(tmpmask);
 	now = ktime_get();
@@ -1067,7 +1063,6 @@ static void tick_broadcast_setup_oneshot(struct clock_event_device *bc,
 
 
 	bc->event_handler = tick_handle_oneshot_broadcast;
-	bc->next_event_forced = 0;
 	bc->next_event = KTIME_MAX;
 
 	/*
@@ -1180,7 +1175,6 @@ void hotplug_cpu__broadcast_tick_pull(int deadcpu)
 		}
 
 		/* This moves the broadcast assignment to this CPU: */
-		bc->next_event_forced = 0;
 		clockevents_program_event(bc, bc->next_event, 1);
 	}
 	raw_spin_unlock_irqrestore(&tick_broadcast_lock, flags);

kernel/time/tick-common.c

@@ -110,7 +110,6 @@ void tick_handle_periodic(struct clock_event_device *dev)
 	int cpu = smp_processor_id();
 	ktime_t next = dev->next_event;
 
-	dev->next_event_forced = 0;
 	tick_periodic(cpu);
 
 	/*

kernel/time/tick-sched.c

@@ -1513,7 +1513,6 @@ static void tick_nohz_lowres_handler(struct clock_event_device *dev)
 	struct tick_sched *ts = this_cpu_ptr(&tick_cpu_sched);
 
 	dev->next_event = KTIME_MAX;
-	dev->next_event_forced = 0;
 
 	if (likely(tick_nohz_handler(&ts->sched_timer) == HRTIMER_RESTART))
 		tick_program_event(hrtimer_get_expires(&ts->sched_timer), 1);