mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 19:21:31 -04:00
powerpc updates for 4.19
Notable changes:
- A fix for a bug in our page table fragment allocator, where a page table page
could be freed and reallocated for something else while still in use, leading
to memory corruption etc. The fix reuses pt_mm in struct page (x86 only) for
a powerpc only refcount.
- Fixes to our pkey support. Several are user-visible changes, but bring us in
to line with x86 behaviour and/or fix outright bugs. Thanks to Florian Weimer
for reporting many of these.
- A series to improve the hvc driver & related OPAL console code, which have
been seen to cause hardlockups at times. The hvc driver changes in particular
have been in linux-next for ~month.
- Increase our MAX_PHYSMEM_BITS to 128TB when SPARSEMEM_VMEMMAP=y.
- Remove Power8 DD1 and Power9 DD1 support, neither chip should be in use
anywhere other than as a paper weight.
- An optimised memcmp implementation using Power7-or-later VMX instructions
- Support for barrier_nospec on some NXP CPUs.
- Support for flushing the count cache on context switch on some IBM CPUs
(controlled by firmware), as a Spectre v2 mitigation.
- A series to enhance the information we print on unhandled signals to bring it
into line with other arches, including showing the offending VMA and dumping
the instructions around the fault.
Thanks to:
Aaro Koskinen, Akshay Adiga, Alastair D'Silva, Alexey Kardashevskiy, Alexey
Spirkov, Alistair Popple, Andrew Donnellan, Aneesh Kumar K.V, Anju T Sudhakar,
Arnd Bergmann, Bartosz Golaszewski, Benjamin Herrenschmidt, Bharat Bhushan,
Bjoern Noetel, Boqun Feng, Breno Leitao, Bryant G. Ly, Camelia Groza,
Christophe Leroy, Christoph Hellwig, Cyril Bur, Dan Carpenter, Daniel Klamt,
Darren Stevens, Dave Young, David Gibson, Diana Craciun, Finn Thain, Florian
Weimer, Frederic Barrat, Gautham R. Shenoy, Geert Uytterhoeven, Geoff Levand,
Guenter Roeck, Gustavo Romero, Haren Myneni, Hari Bathini, Joel Stanley,
Jonathan Neuschäfer, Kees Cook, Madhavan Srinivasan, Mahesh Salgaonkar, Markus
Elfring, Mathieu Malaterre, Mauro S. M. Rodrigues, Michael Hanselmann, Michael
Neuling, Michael Schmitz, Mukesh Ojha, Murilo Opsfelder Araujo, Nicholas
Piggin, Parth Y Shah, Paul Mackerras, Paul Menzel, Ram Pai, Randy Dunlap,
Rashmica Gupta, Reza Arbab, Rodrigo R. Galvao, Russell Currey, Sam Bobroff,
Scott Wood, Shilpasri G Bhat, Simon Guo, Souptick Joarder, Stan Johnson,
Thiago Jung Bauermann, Tyrel Datwyler, Vaibhav Jain, Vasant Hegde, Venkat Rao
B, zhong jiang.
-----BEGIN PGP SIGNATURE-----
iQJHBAABCgAxFiEEJFGtCPCthwEv2Y/bUevqPMjhpYAFAlt2O6cTHG1wZUBlbGxl
cm1hbi5pZC5hdQAKCRBR6+o8yOGlgC7hD/4+cj796Df7GsVsIMxzQm7SS9dklIdO
JuKj2Nr5HRzTH59jWlXukLG9mfTNCFgFJB4gEpK1ArDOTcHTCI9RRsLZTZ/kum66
7Pd+7T40dLYXB5uecuUs0vMXa2fI3syKh1VLzACSXv3Dh9BBIKQBwW/aD2eww4YI
1fS5LnXZ2PSxfr6KNAC6ogZnuaiD0sHXOYrtGHq+S/TFC7+Z6ySa6+AnPS+hPVoo
/rHDE1Khr66aj7uk+PP2IgUrCFj6Sbj6hTVlS/iAuwbMjUl9ty6712PmvX9x6wMZ
13hJQI+g6Ci+lqLKqmqVUpXGSr6y4NJGPS/Hko4IivBTJApI+qV/tF2H9nxU+6X0
0RqzsMHPHy13n2torA1gC7ttzOuXPI4hTvm6JWMSsfmfjTxLANJng3Dq3ejh6Bqw
76EMowpDLexwpy7/glPpqNdsP4ySf2Qm8yq3mR7qpL4m3zJVRGs11x+s5DW8NKBL
Fl5SqZvd01abH+sHwv6NLaLkEtayUyohxvyqu2RU3zu5M5vi7DhqstybTPjKPGu0
icSPh7b2y10WpOUpC6lxpdi8Me8qH47mVc/trZ+SpgBrsuEmtJhGKszEnzRCOqos
o2IhYHQv3lQv86kpaAFQlg/RO+Lv+Lo5qbJ209V+hfU5nYzXpEulZs4dx1fbA+ze
fK8GEh+u0L4uJg==
=PzRz
-----END PGP SIGNATURE-----
Merge tag 'powerpc-4.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux
Pull powerpc updates from Michael Ellerman:
"Notable changes:
- A fix for a bug in our page table fragment allocator, where a page
table page could be freed and reallocated for something else while
still in use, leading to memory corruption etc. The fix reuses
pt_mm in struct page (x86 only) for a powerpc only refcount.
- Fixes to our pkey support. Several are user-visible changes, but
bring us in to line with x86 behaviour and/or fix outright bugs.
Thanks to Florian Weimer for reporting many of these.
- A series to improve the hvc driver & related OPAL console code,
which have been seen to cause hardlockups at times. The hvc driver
changes in particular have been in linux-next for ~month.
- Increase our MAX_PHYSMEM_BITS to 128TB when SPARSEMEM_VMEMMAP=y.
- Remove Power8 DD1 and Power9 DD1 support, neither chip should be in
use anywhere other than as a paper weight.
- An optimised memcmp implementation using Power7-or-later VMX
instructions
- Support for barrier_nospec on some NXP CPUs.
- Support for flushing the count cache on context switch on some IBM
CPUs (controlled by firmware), as a Spectre v2 mitigation.
- A series to enhance the information we print on unhandled signals
to bring it into line with other arches, including showing the
offending VMA and dumping the instructions around the fault.
Thanks to: Aaro Koskinen, Akshay Adiga, Alastair D'Silva, Alexey
Kardashevskiy, Alexey Spirkov, Alistair Popple, Andrew Donnellan,
Aneesh Kumar K.V, Anju T Sudhakar, Arnd Bergmann, Bartosz Golaszewski,
Benjamin Herrenschmidt, Bharat Bhushan, Bjoern Noetel, Boqun Feng,
Breno Leitao, Bryant G. Ly, Camelia Groza, Christophe Leroy, Christoph
Hellwig, Cyril Bur, Dan Carpenter, Daniel Klamt, Darren Stevens, Dave
Young, David Gibson, Diana Craciun, Finn Thain, Florian Weimer,
Frederic Barrat, Gautham R. Shenoy, Geert Uytterhoeven, Geoff Levand,
Guenter Roeck, Gustavo Romero, Haren Myneni, Hari Bathini, Joel
Stanley, Jonathan Neuschäfer, Kees Cook, Madhavan Srinivasan, Mahesh
Salgaonkar, Markus Elfring, Mathieu Malaterre, Mauro S. M. Rodrigues,
Michael Hanselmann, Michael Neuling, Michael Schmitz, Mukesh Ojha,
Murilo Opsfelder Araujo, Nicholas Piggin, Parth Y Shah, Paul
Mackerras, Paul Menzel, Ram Pai, Randy Dunlap, Rashmica Gupta, Reza
Arbab, Rodrigo R. Galvao, Russell Currey, Sam Bobroff, Scott Wood,
Shilpasri G Bhat, Simon Guo, Souptick Joarder, Stan Johnson, Thiago
Jung Bauermann, Tyrel Datwyler, Vaibhav Jain, Vasant Hegde, Venkat
Rao, zhong jiang"
* tag 'powerpc-4.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux: (234 commits)
powerpc/mm/book3s/radix: Add mapping statistics
powerpc/uaccess: Enable get_user(u64, *p) on 32-bit
powerpc/mm/hash: Remove unnecessary do { } while(0) loop
powerpc/64s: move machine check SLB flushing to mm/slb.c
powerpc/powernv/idle: Fix build error
powerpc/mm/tlbflush: update the mmu_gather page size while iterating address range
powerpc/mm: remove warning about ‘type’ being set
powerpc/32: Include setup.h header file to fix warnings
powerpc: Move `path` variable inside DEBUG_PROM
powerpc/powermac: Make some functions static
powerpc/powermac: Remove variable x that's never read
cxl: remove a dead branch
powerpc/powermac: Add missing include of header pmac.h
powerpc/kexec: Use common error handling code in setup_new_fdt()
powerpc/xmon: Add address lookup for percpu symbols
powerpc/mm: remove huge_pte_offset_and_shift() prototype
powerpc/lib: Use patch_site to patch copy_32 functions once cache is enabled
powerpc/pseries: Fix endianness while restoring of r3 in MCE handler.
powerpc/fadump: merge adjacent memory ranges to reduce PT_LOAD segements
powerpc/fadump: handle crash memory ranges array index overflow
...
This commit is contained in:
Linus Torvalds
commit
5e2d059b52
363 changed files with 5246 additions and 5250 deletions
|
|
@ -242,6 +242,7 @@ static inline void add_powernv_state(int index, const char *name,
|
|||
powernv_states[index].target_residency = target_residency;
|
||||
powernv_states[index].exit_latency = exit_latency;
|
||||
powernv_states[index].enter = idle_fn;
|
||||
/* For power8 and below psscr_* will be 0 */
|
||||
stop_psscr_table[index].val = psscr_val;
|
||||
stop_psscr_table[index].mask = psscr_mask;
|
||||
}
|
||||
|
|
@ -263,186 +264,80 @@ static inline int validate_dt_prop_sizes(const char *prop1, int prop1_len,
|
|||
extern u32 pnv_get_supported_cpuidle_states(void);
|
||||
static int powernv_add_idle_states(void)
|
||||
{
|
||||
struct device_node *power_mgt;
|
||||
int nr_idle_states = 1; /* Snooze */
|
||||
int dt_idle_states, count;
|
||||
u32 latency_ns[CPUIDLE_STATE_MAX];
|
||||
u32 residency_ns[CPUIDLE_STATE_MAX];
|
||||
u32 flags[CPUIDLE_STATE_MAX];
|
||||
u64 psscr_val[CPUIDLE_STATE_MAX];
|
||||
u64 psscr_mask[CPUIDLE_STATE_MAX];
|
||||
const char *names[CPUIDLE_STATE_MAX];
|
||||
int dt_idle_states;
|
||||
u32 has_stop_states = 0;
|
||||
int i, rc;
|
||||
int i;
|
||||
u32 supported_flags = pnv_get_supported_cpuidle_states();
|
||||
|
||||
|
||||
/* Currently we have snooze statically defined */
|
||||
|
||||
power_mgt = of_find_node_by_path("/ibm,opal/power-mgt");
|
||||
if (!power_mgt) {
|
||||
pr_warn("opal: PowerMgmt Node not found\n");
|
||||
if (nr_pnv_idle_states <= 0) {
|
||||
pr_warn("cpuidle-powernv : Only Snooze is available\n");
|
||||
goto out;
|
||||
}
|
||||
|
||||
/* Read values of any property to determine the num of idle states */
|
||||
dt_idle_states = of_property_count_u32_elems(power_mgt, "ibm,cpu-idle-state-flags");
|
||||
if (dt_idle_states < 0) {
|
||||
pr_warn("cpuidle-powernv: no idle states found in the DT\n");
|
||||
goto out;
|
||||
}
|
||||
|
||||
count = of_property_count_u32_elems(power_mgt,
|
||||
"ibm,cpu-idle-state-latencies-ns");
|
||||
|
||||
if (validate_dt_prop_sizes("ibm,cpu-idle-state-flags", dt_idle_states,
|
||||
"ibm,cpu-idle-state-latencies-ns",
|
||||
count) != 0)
|
||||
goto out;
|
||||
|
||||
count = of_property_count_strings(power_mgt,
|
||||
"ibm,cpu-idle-state-names");
|
||||
if (validate_dt_prop_sizes("ibm,cpu-idle-state-flags", dt_idle_states,
|
||||
"ibm,cpu-idle-state-names",
|
||||
count) != 0)
|
||||
goto out;
|
||||
/* TODO: Count only states which are eligible for cpuidle */
|
||||
dt_idle_states = nr_pnv_idle_states;
|
||||
|
||||
/*
|
||||
* Since snooze is used as first idle state, max idle states allowed is
|
||||
* CPUIDLE_STATE_MAX -1
|
||||
*/
|
||||
if (dt_idle_states > CPUIDLE_STATE_MAX - 1) {
|
||||
if (nr_pnv_idle_states > CPUIDLE_STATE_MAX - 1) {
|
||||
pr_warn("cpuidle-powernv: discovered idle states more than allowed");
|
||||
dt_idle_states = CPUIDLE_STATE_MAX - 1;
|
||||
}
|
||||
|
||||
if (of_property_read_u32_array(power_mgt,
|
||||
"ibm,cpu-idle-state-flags", flags, dt_idle_states)) {
|
||||
pr_warn("cpuidle-powernv : missing ibm,cpu-idle-state-flags in DT\n");
|
||||
goto out;
|
||||
}
|
||||
|
||||
if (of_property_read_u32_array(power_mgt,
|
||||
"ibm,cpu-idle-state-latencies-ns", latency_ns,
|
||||
dt_idle_states)) {
|
||||
pr_warn("cpuidle-powernv: missing ibm,cpu-idle-state-latencies-ns in DT\n");
|
||||
goto out;
|
||||
}
|
||||
if (of_property_read_string_array(power_mgt,
|
||||
"ibm,cpu-idle-state-names", names, dt_idle_states) < 0) {
|
||||
pr_warn("cpuidle-powernv: missing ibm,cpu-idle-state-names in DT\n");
|
||||
goto out;
|
||||
}
|
||||
|
||||
/*
|
||||
* If the idle states use stop instruction, probe for psscr values
|
||||
* and psscr mask which are necessary to specify required stop level.
|
||||
*/
|
||||
has_stop_states = (flags[0] &
|
||||
has_stop_states = (pnv_idle_states[0].flags &
|
||||
(OPAL_PM_STOP_INST_FAST | OPAL_PM_STOP_INST_DEEP));
|
||||
if (has_stop_states) {
|
||||
count = of_property_count_u64_elems(power_mgt,
|
||||
"ibm,cpu-idle-state-psscr");
|
||||
if (validate_dt_prop_sizes("ibm,cpu-idle-state-flags",
|
||||
dt_idle_states,
|
||||
"ibm,cpu-idle-state-psscr",
|
||||
count) != 0)
|
||||
goto out;
|
||||
|
||||
count = of_property_count_u64_elems(power_mgt,
|
||||
"ibm,cpu-idle-state-psscr-mask");
|
||||
if (validate_dt_prop_sizes("ibm,cpu-idle-state-flags",
|
||||
dt_idle_states,
|
||||
"ibm,cpu-idle-state-psscr-mask",
|
||||
count) != 0)
|
||||
goto out;
|
||||
|
||||
if (of_property_read_u64_array(power_mgt,
|
||||
"ibm,cpu-idle-state-psscr", psscr_val, dt_idle_states)) {
|
||||
pr_warn("cpuidle-powernv: missing ibm,cpu-idle-state-psscr in DT\n");
|
||||
goto out;
|
||||
}
|
||||
|
||||
if (of_property_read_u64_array(power_mgt,
|
||||
"ibm,cpu-idle-state-psscr-mask",
|
||||
psscr_mask, dt_idle_states)) {
|
||||
pr_warn("cpuidle-powernv:Missing ibm,cpu-idle-state-psscr-mask in DT\n");
|
||||
goto out;
|
||||
}
|
||||
}
|
||||
|
||||
count = of_property_count_u32_elems(power_mgt,
|
||||
"ibm,cpu-idle-state-residency-ns");
|
||||
|
||||
if (count < 0) {
|
||||
rc = count;
|
||||
} else if (validate_dt_prop_sizes("ibm,cpu-idle-state-flags",
|
||||
dt_idle_states,
|
||||
"ibm,cpu-idle-state-residency-ns",
|
||||
count) != 0) {
|
||||
goto out;
|
||||
} else {
|
||||
rc = of_property_read_u32_array(power_mgt,
|
||||
"ibm,cpu-idle-state-residency-ns",
|
||||
residency_ns, dt_idle_states);
|
||||
}
|
||||
|
||||
for (i = 0; i < dt_idle_states; i++) {
|
||||
unsigned int exit_latency, target_residency;
|
||||
bool stops_timebase = false;
|
||||
struct pnv_idle_states_t *state = &pnv_idle_states[i];
|
||||
|
||||
/*
|
||||
* Skip the platform idle state whose flag isn't in
|
||||
* the supported_cpuidle_states flag mask.
|
||||
*/
|
||||
if ((flags[i] & supported_flags) != flags[i])
|
||||
if ((state->flags & supported_flags) != state->flags)
|
||||
continue;
|
||||
/*
|
||||
* If an idle state has exit latency beyond
|
||||
* POWERNV_THRESHOLD_LATENCY_NS then don't use it
|
||||
* in cpu-idle.
|
||||
*/
|
||||
if (latency_ns[i] > POWERNV_THRESHOLD_LATENCY_NS)
|
||||
if (state->latency_ns > POWERNV_THRESHOLD_LATENCY_NS)
|
||||
continue;
|
||||
/*
|
||||
* Firmware passes residency and latency values in ns.
|
||||
* cpuidle expects it in us.
|
||||
*/
|
||||
exit_latency = DIV_ROUND_UP(latency_ns[i], 1000);
|
||||
if (!rc)
|
||||
target_residency = DIV_ROUND_UP(residency_ns[i], 1000);
|
||||
else
|
||||
target_residency = 0;
|
||||
exit_latency = DIV_ROUND_UP(state->latency_ns, 1000);
|
||||
target_residency = DIV_ROUND_UP(state->residency_ns, 1000);
|
||||
|
||||
if (has_stop_states) {
|
||||
int err = validate_psscr_val_mask(&psscr_val[i],
|
||||
&psscr_mask[i],
|
||||
flags[i]);
|
||||
if (err) {
|
||||
report_invalid_psscr_val(psscr_val[i], err);
|
||||
if (has_stop_states && !(state->valid))
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
if (flags[i] & OPAL_PM_TIMEBASE_STOP)
|
||||
if (state->flags & OPAL_PM_TIMEBASE_STOP)
|
||||
stops_timebase = true;
|
||||
|
||||
/*
|
||||
* For nap and fastsleep, use default target_residency
|
||||
* values if f/w does not expose it.
|
||||
*/
|
||||
if (flags[i] & OPAL_PM_NAP_ENABLED) {
|
||||
if (!rc)
|
||||
target_residency = 100;
|
||||
if (state->flags & OPAL_PM_NAP_ENABLED) {
|
||||
/* Add NAP state */
|
||||
add_powernv_state(nr_idle_states, "Nap",
|
||||
CPUIDLE_FLAG_NONE, nap_loop,
|
||||
target_residency, exit_latency, 0, 0);
|
||||
} else if (has_stop_states && !stops_timebase) {
|
||||
add_powernv_state(nr_idle_states, names[i],
|
||||
add_powernv_state(nr_idle_states, state->name,
|
||||
CPUIDLE_FLAG_NONE, stop_loop,
|
||||
target_residency, exit_latency,
|
||||
psscr_val[i], psscr_mask[i]);
|
||||
state->psscr_val,
|
||||
state->psscr_mask);
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -450,20 +345,19 @@ static int powernv_add_idle_states(void)
|
|||
* within this config dependency check.
|
||||
*/
|
||||
#ifdef CONFIG_TICK_ONESHOT
|
||||
else if (flags[i] & OPAL_PM_SLEEP_ENABLED ||
|
||||
flags[i] & OPAL_PM_SLEEP_ENABLED_ER1) {
|
||||
if (!rc)
|
||||
target_residency = 300000;
|
||||
else if (state->flags & OPAL_PM_SLEEP_ENABLED ||
|
||||
state->flags & OPAL_PM_SLEEP_ENABLED_ER1) {
|
||||
/* Add FASTSLEEP state */
|
||||
add_powernv_state(nr_idle_states, "FastSleep",
|
||||
CPUIDLE_FLAG_TIMER_STOP,
|
||||
fastsleep_loop,
|
||||
target_residency, exit_latency, 0, 0);
|
||||
} else if (has_stop_states && stops_timebase) {
|
||||
add_powernv_state(nr_idle_states, names[i],
|
||||
add_powernv_state(nr_idle_states, state->name,
|
||||
CPUIDLE_FLAG_TIMER_STOP, stop_loop,
|
||||
target_residency, exit_latency,
|
||||
psscr_val[i], psscr_mask[i]);
|
||||
state->psscr_val,
|
||||
state->psscr_mask);
|
||||
}
|
||||
#endif
|
||||
else
|
||||
|
|
|
|||
Loading…
Reference in a new issue