Highlights:

-----------
 - Add a dummy L2 cache's write_sec callback as in non secure mode execution,
    we can't get access to L2 cache secure registers
 - Cosmetics change, in case of dump_stack, update the hardware name with a
    more generic for the STi SoCs family
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJXg0vhAAoJEMrHeC97M/+mGfAP+wdA0bcdHJ4RmnqKxc4f6qrB
 QPnYFSgN2VWX/PkIPRI6zuWfRfkCrjjXTrJHD7GabeZmjFBeREJ5Y4g13kO7fEcH
 UUnok7zeB39dEAppRVibObJSbFyVPwo1vUOKRzYQTBCavcMMyP38aCRldi9tqmvp
 VEh0i7hgBEtL11nMPVcn0sge7l5EfXe54xZFAgbcDwJ4VtWXT8FbAnkPNrUs5Nmg
 KtOkCWa4pdqWA7ns1IwBwMiAJ84XAVPVwBNFwcF573tqa93XHhLzjDM/w875Gc8E
 IpkxnasI/yHWExbbPH43I0Namgm74I9mP1s/o85L/ZVENGb+0YdHXI3jrlGTMhpC
 dKFijHKBOKEhleQ12rtLNHulUT1mqAvdS5AABNtSTjEHHlKkQt5ehE/r/9O84tro
 abZVJSbiP850cpMO9nrG8Zs3XME/f5kB4b7HcfYtEwcS4Ecch8nd7ENe92WzbeOQ
 3I7Kk0PMm2eMkupfVTiZ2ltlc4kxWElWW5SDWZcP4bS87xi5uGGeUeOgnoLAeDOL
 HCWmy5WeoZfE+cdwUk59VT2BRmYaD2sRpnClX/gbFlGN815pw6dmGJEqJpQUktg0
 O5dVZpM1nHr8zufONL7sY6EofXQZ5b1gDeTzEcr4nuCbkf7ec6l5cAE7whkH3LnZ
 WSDuaDSIn4FCLtSbtxxz
 =T9v2
 -----END PGP SIGNATURE-----

Merge tag 'sti-soc-for-v4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/pchotard/sti into next/soc

Merge "STi SoC changes for v4.8" from Patrice Chotard:

- Add a dummy L2 cache's write_sec callback as in non secure mode execution,
   we can't get access to L2 cache secure registers
- Cosmetics change, in case of dump_stack, update the hardware name with a
   more generic for the STi SoCs family

* tag 'sti-soc-for-v4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/pchotard/sti:
  ARM: sti: Implement dummy L2 cache's write_sec
  ARM: STi: Update machine _namestr to be more generic.
This commit is contained in:
Arnd Bergmann 2016-07-14 15:08:15 +02:00
commit a98405432e
1 changed files with 10 additions and 1 deletions

View File

@ -23,7 +23,15 @@ static const char *const stih41x_dt_match[] __initconst = {
NULL
};
DT_MACHINE_START(STM, "STiH415/416 SoC with Flattened Device Tree")
static void sti_l2_write_sec(unsigned long val, unsigned reg)
{
/*
* We can't write to secure registers as we are in non-secure
* mode, until we have some SMI service available.
*/
}
DT_MACHINE_START(STM, "STi SoC with Flattened Device Tree")
.dt_compat = stih41x_dt_match,
.l2c_aux_val = L2C_AUX_CTRL_SHARED_OVERRIDE |
L310_AUX_CTRL_DATA_PREFETCH |
@ -31,4 +39,5 @@ DT_MACHINE_START(STM, "STiH415/416 SoC with Flattened Device Tree")
L2C_AUX_CTRL_WAY_SIZE(4),
.l2c_aux_mask = 0xc0000fff,
.smp = smp_ops(sti_smp_ops),
.l2c_write_sec = sti_l2_write_sec,
MACHINE_END