This pull request contains Broadcom ARM-based SoC changes for 5.19,

please pull the following:
 
 - Julia fixes a couple of typographic errors in the Brahma-B15 read
   ahead cache driver and in the ARCH_BRCMSTB bare metal SMP bring-up code
 
 - William adds a Kconfig entry for ARCH_BCMBCA which will be used to
   upstream support for Broadcom's broadband SoCs
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEm+Rq3+YGJdiR9yuFh9CWnEQHBwQFAmJy52kACgkQh9CWnEQH
 BwQ//w//edWiVqBnCJsTcsOvFcCACp6cZLDRfS8wAKr1lqipoCcVDuDyKP5qaIZb
 Ev9H3kciGafX/h5ODrWpzjSFgDoQFW+MEFnidDeHIvW0j3eg2xn+F1CM3tuhdFbI
 aiN6wBjFVrQCGBIMeQoSse+lixNfhMkXysc2elgyNcZZg+IYuaWd4uMPMo5G5BHV
 veC8CXXtwihXsREBKp+BPhWk7qtHE875suTTNbw7Wp5z0pU3DspI0dKIFnlG4p9i
 PnhEZ5t3EQuGx7xBxWVw3Tk+tqwQd0bprrtAmE49cE4x2gr93aiOEb32uifiDsL4
 v00aEkgt3rWNP42ICelxYNcNE3cvjF+43+NsYW5pxscIEm90bz5NqTDHq6NUO/wm
 bIP2TD8gL3iDIWGRuUwEA+rnmJEP4XXFaJWzKSpprxIu3+drtIk1allD/kVwBRaf
 ufmCiL7tZk3CST0rLzYL7FxXFns2QUx3Jh0kgVK9+CbRv+p22CHwnbUXmczhSQfF
 G7s7fJ3n9yld9PhWof8xWbMdKBRXLrcssFQ66td0zpXXwX5XBB4Qg3IZZyfkXyNw
 kTK4OTfQrmrlalZnM9bMWUh1Mt3yGj0WCQeBop2pU4MZEL4Qw1kMRgZUXGgyEAcc
 SKMNu4VhjWlhSqbMz6XhfjY0l9BUKi6uW7HQRn+BKYS7fxJ6JCg=
 =PXbY
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmJ0IDcACgkQmmx57+YA
 GNmNRhAArhOv44wWZSZwwT4pkFOPXzPtuEQnepRIt/1PJruD2XBQ5KyCcobKBPQO
 VyVF3v2erorMcDQNRiEsEJgS27MkhZ3KXRHGecViRQVYf3VyuKawGYFgIt82hrJL
 Tl7HaRmL0mUFSHfk1oGicLD4tMSSHp4LiNvgHR+bQgcGoG2YN5/OkatJBJ3hYpMu
 QZCFQk6efWf9EA9Z+89+MPaG5u60m8lcIDbjSeYnswAC3RQQ8q017dzCyj1hKsd8
 eDGr6hBdBgA+8hpPbZDRh0lWdHX4LzgJaMNOtieVHacEmcdZCJiuQELXyVlfeuC7
 Eho4+gFjlvqCeQ9r+XnOz9d1pVrLbfR+KFAHw/onJrZsig1U7qA2IohNCZWIjLvh
 hWCs3us4qTnagDRIYW1SktAvu2igNzWZ4Ev5ydBlD+0n0ZUR+VxvnS/zA/t5rYh3
 sHr387KJ4JykY+CZI+kRF0qtWcidKOjzTBEFnId5YO+tX6WS6yyKfgoHmfV4Osf/
 XvUwpji22ydTVEWKZHfB+jn3F2WcH9XwoScDMQsgpo/H2zj70KsI/i/a61Dtm4NW
 B8Qo5Sh81r8KzmBtLEFJDLCVPQK5F4B4MOTWhfY67/Snf222BuC2Ukyu0MXNmPN1
 4xfWOYLB5Lgeb96funtiRq+KIF8yimbVtFz9W1IFwZNvtrn2kuc=
 =TdIC
 -----END PGP SIGNATURE-----

Merge tag 'arm-soc/for-5.19/soc' of https://github.com/Broadcom/stblinux into arm/soc

This pull request contains Broadcom ARM-based SoC changes for 5.19,
please pull the following:

- Julia fixes a couple of typographic errors in the Brahma-B15 read
  ahead cache driver and in the ARCH_BRCMSTB bare metal SMP bring-up code

- William adds a Kconfig entry for ARCH_BCMBCA which will be used to
  upstream support for Broadcom's broadband SoCs

* tag 'arm-soc/for-5.19/soc' of https://github.com/Broadcom/stblinux:
  arm: bcmbca: add arch bcmbca machine entry
  ARM: brcmstb: fix typos in comments
  ARM: mm: fix typos in comments

Link: https://lore.kernel.org/r/20220504210942.1838248-6-f.fainelli@gmail.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2022-05-05 21:06:30 +02:00
commit caf10a34aa
3 changed files with 14 additions and 2 deletions

View File

@ -218,4 +218,16 @@ config ARCH_BRCMSTB
This enables support for Broadcom ARM-based set-top box chipsets,
including the 7445 family of chips.
config ARCH_BCMBCA
bool "Broadcom Broadband SoC"
depends on ARCH_MULTI_V7
select ARM_AMBA
select ARM_GIC
select HAVE_ARM_ARCH_TIMER
help
Say Y if you intend to run the kernel on a Broadcom Broadband ARM-based
BCA chipset.
This enables support for Broadcom BCA ARM-based broadband chipsets,
including the DSL, PON and Wireless family of chips.
endif

View File

@ -59,7 +59,7 @@ static u32 hif_cont_reg;
/*
* We must quiesce a dying CPU before it can be killed by the boot CPU. Because
* one or more cache may be disabled, we must flush to ensure coherency. We
* cannot use traditionl completion structures or spinlocks as they rely on
* cannot use traditional completion structures or spinlocks as they rely on
* coherency.
*/
static DEFINE_PER_CPU_ALIGNED(int, per_cpu_sw_state);

View File

@ -74,7 +74,7 @@ static inline void __b15_rac_flush(void)
__raw_writel(FLUSH_RAC, b15_rac_base + rac_flush_offset);
do {
/* This dmb() is required to force the Bus Interface Unit
* to clean oustanding writes, and forces an idle cycle
* to clean outstanding writes, and forces an idle cycle
* to be inserted.
*/
dmb();