* [GIT PULL 1/2] bcm2835-dt-next-2017-08-15
@ 2017-08-15 18:03 Eric Anholt
2017-08-15 18:03 ` [GIT PULL 2/2] bcm2835-soc-next-2017-08-15 Eric Anholt
2017-08-17 1:11 ` [GIT PULL 1/2] bcm2835-dt-next-2017-08-15 Florian Fainelli
0 siblings, 2 replies; 6+ messages in thread
From: Eric Anholt @ 2017-08-15 18:03 UTC (permalink / raw)
To: linux-arm-kernel
The following changes since commit ad41eacc11046fe6a199cffb6663bcd9c90df2f8:
Merge tag 'bcm2835-dt-next-2017-08-07' into devicetree/next (2017-08-07 10:45:35 -0700)
are available in the git repository at:
git://github.com/anholt/linux tags/bcm2835-dt-next-2017-08-15
for you to fetch changes up to f29c256853b7412961d3ee80ca525bd2530573db:
ARM: dts: bcm283x: Add 32-bit enable method for SMP (2017-08-14 20:09:44 +0200)
----------------------------------------------------------------
This pull request brings in a new SMP enable-method compat string,
which is needed to move the 32-bit SMP boot code out of the irqchip.
----------------------------------------------------------------
Stefan Wahren (2):
dt-bindings: arm: add SMP enable-method for BCM2836
ARM: dts: bcm283x: Add 32-bit enable method for SMP
Documentation/devicetree/bindings/arm/cpus.txt | 1 +
arch/arm/boot/dts/bcm2836.dtsi | 1 +
arch/arm/boot/dts/bcm2837.dtsi | 1 +
3 files changed, 3 insertions(+)
^ permalink raw reply [flat|nested] 6+ messages in thread
* [GIT PULL 2/2] bcm2835-soc-next-2017-08-15
2017-08-15 18:03 [GIT PULL 1/2] bcm2835-dt-next-2017-08-15 Eric Anholt
@ 2017-08-15 18:03 ` Eric Anholt
2017-08-17 1:26 ` Florian Fainelli
2017-08-17 1:11 ` [GIT PULL 1/2] bcm2835-dt-next-2017-08-15 Florian Fainelli
1 sibling, 1 reply; 6+ messages in thread
From: Eric Anholt @ 2017-08-15 18:03 UTC (permalink / raw)
To: linux-arm-kernel
The following changes since commit f29c256853b7412961d3ee80ca525bd2530573db:
ARM: dts: bcm283x: Add 32-bit enable method for SMP (2017-08-14 20:09:44 +0200)
are available in the git repository at:
git://github.com/anholt/linux tags/bcm2835-soc-next-2017-08-15
for you to fetch changes up to 067b437e55a892e3ebb13e40c98825fcfa1e2d99:
ARM: bcm2836: Send event when onlining other cores (2017-08-15 10:52:26 -0700)
----------------------------------------------------------------
This pull request brings in two things.
One is to use sev() to wake up CPUs that might be sleeping when doing
the custom spin-table boot process in 32-bit mode (new firmware
versions will have the CPUs sleeping waiting for an event instead of
just spinning). However, the irqchip maintainer objected to our SMP
code continuing to live in the driver, so we had to move it to
platsmp.c, and to do that we needed a new SMP enable-method to the DT
for the platsmp.c to attach to (thus the DT cross-merge in this PR).
The platsmp.c patch was acked by irqchip for going through arm-soc.
The other piece is a garbage-collection of the platform's stub clock
driver for early Raspberry Pi support, before the native clock driver
was added. This was acked by the clk subsystem for going through our
tree as well.
----------------------------------------------------------------
Danilo Krummrich (1):
clk: bcm2835: remove remains from stub clk driver
Eric Anholt (1):
Merge tag 'bcm2835-dt-next-2017-08-15' into HEAD
Phil Elwell (1):
ARM: bcm2836: Send event when onlining other cores
Stefan Wahren (1):
irqchip: bcm2836: Move SMP startup code to arch/arm
arch/arm/mach-bcm/Makefile | 5 +++
arch/arm/mach-bcm/board_bcm2835.c | 7 ----
arch/arm/mach-bcm/platsmp.c | 38 ++++++++++++++++++
drivers/clk/bcm/clk-bcm2835-aux.c | 1 -
drivers/clk/bcm/clk-bcm2835.c | 30 --------------
drivers/irqchip/irq-bcm2836.c | 79 +------------------------------------
include/linux/clk/bcm2835.h | 24 -----------
include/linux/irqchip/irq-bcm2836.h | 70 ++++++++++++++++++++++++++++++++
8 files changed, 115 insertions(+), 139 deletions(-)
delete mode 100644 include/linux/clk/bcm2835.h
create mode 100644 include/linux/irqchip/irq-bcm2836.h
^ permalink raw reply [flat|nested] 6+ messages in thread
* [GIT PULL 2/2] bcm2835-soc-next-2017-08-15
2017-08-15 18:03 ` [GIT PULL 2/2] bcm2835-soc-next-2017-08-15 Eric Anholt
@ 2017-08-17 1:26 ` Florian Fainelli
2017-08-17 16:12 ` Eric Anholt
0 siblings, 1 reply; 6+ messages in thread
From: Florian Fainelli @ 2017-08-17 1:26 UTC (permalink / raw)
To: linux-arm-kernel
On 08/15/2017 11:03 AM, Eric Anholt wrote:
> The following changes since commit f29c256853b7412961d3ee80ca525bd2530573db:
>
> ARM: dts: bcm283x: Add 32-bit enable method for SMP (2017-08-14 20:09:44 +0200)
>
> are available in the git repository at:
>
> git://github.com/anholt/linux tags/bcm2835-soc-next-2017-08-15
>
> for you to fetch changes up to 067b437e55a892e3ebb13e40c98825fcfa1e2d99:
>
> ARM: bcm2836: Send event when onlining other cores (2017-08-15 10:52:26 -0700)
>
> ----------------------------------------------------------------
> This pull request brings in two things.
>
> One is to use sev() to wake up CPUs that might be sleeping when doing
> the custom spin-table boot process in 32-bit mode (new firmware
> versions will have the CPUs sleeping waiting for an event instead of
> just spinning). However, the irqchip maintainer objected to our SMP
> code continuing to live in the driver, so we had to move it to
> platsmp.c, and to do that we needed a new SMP enable-method to the DT
> for the platsmp.c to attach to (thus the DT cross-merge in this PR).
> The platsmp.c patch was acked by irqchip for going through arm-soc.
This does make us pull quite a lot of changes, how about I just
cherry-pick "ARM: dts: bcm283x: Add 32-bit enable method for SMP" such
that the branch in itself is functional as-is, but we don't pull in
everything else from devicetree/next?
>
> The other piece is a garbage-collection of the platform's stub clock
> driver for early Raspberry Pi support, before the native clock driver
> was added. This was acked by the clk subsystem for going through our
> tree as well.
>
> ----------------------------------------------------------------
> Danilo Krummrich (1):
> clk: bcm2835: remove remains from stub clk driver
>
> Eric Anholt (1):
> Merge tag 'bcm2835-dt-next-2017-08-15' into HEAD
>
> Phil Elwell (1):
> ARM: bcm2836: Send event when onlining other cores
>
> Stefan Wahren (1):
> irqchip: bcm2836: Move SMP startup code to arch/arm
>
> arch/arm/mach-bcm/Makefile | 5 +++
> arch/arm/mach-bcm/board_bcm2835.c | 7 ----
> arch/arm/mach-bcm/platsmp.c | 38 ++++++++++++++++++
> drivers/clk/bcm/clk-bcm2835-aux.c | 1 -
> drivers/clk/bcm/clk-bcm2835.c | 30 --------------
> drivers/irqchip/irq-bcm2836.c | 79 +------------------------------------
> include/linux/clk/bcm2835.h | 24 -----------
> include/linux/irqchip/irq-bcm2836.h | 70 ++++++++++++++++++++++++++++++++
> 8 files changed, 115 insertions(+), 139 deletions(-)
> delete mode 100644 include/linux/clk/bcm2835.h
> create mode 100644 include/linux/irqchip/irq-bcm2836.h
>
--
Florian
^ permalink raw reply [flat|nested] 6+ messages in thread
* [GIT PULL 2/2] bcm2835-soc-next-2017-08-15
2017-08-17 1:26 ` Florian Fainelli
@ 2017-08-17 16:12 ` Eric Anholt
2017-08-17 18:41 ` Florian Fainelli
0 siblings, 1 reply; 6+ messages in thread
From: Eric Anholt @ 2017-08-17 16:12 UTC (permalink / raw)
To: linux-arm-kernel
Florian Fainelli <f.fainelli@gmail.com> writes:
> On 08/15/2017 11:03 AM, Eric Anholt wrote:
>> The following changes since commit f29c256853b7412961d3ee80ca525bd2530573db:
>>
>> ARM: dts: bcm283x: Add 32-bit enable method for SMP (2017-08-14 20:09:44 +0200)
>>
>> are available in the git repository at:
>>
>> git://github.com/anholt/linux tags/bcm2835-soc-next-2017-08-15
>>
>> for you to fetch changes up to 067b437e55a892e3ebb13e40c98825fcfa1e2d99:
>>
>> ARM: bcm2836: Send event when onlining other cores (2017-08-15 10:52:26 -0700)
>>
>> ----------------------------------------------------------------
>> This pull request brings in two things.
>>
>> One is to use sev() to wake up CPUs that might be sleeping when doing
>> the custom spin-table boot process in 32-bit mode (new firmware
>> versions will have the CPUs sleeping waiting for an event instead of
>> just spinning). However, the irqchip maintainer objected to our SMP
>> code continuing to live in the driver, so we had to move it to
>> platsmp.c, and to do that we needed a new SMP enable-method to the DT
>> for the platsmp.c to attach to (thus the DT cross-merge in this PR).
>> The platsmp.c patch was acked by irqchip for going through arm-soc.
>
> This does make us pull quite a lot of changes, how about I just
> cherry-pick "ARM: dts: bcm283x: Add 32-bit enable method for SMP" such
> that the branch in itself is functional as-is, but we don't pull in
> everything else from devicetree/next?
Then you get the commit duplicated in the history, which people
generally dislike even more. Also, it depends on the arm64->arm move,
so you'd need that as well.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 832 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20170817/3cf7946c/attachment-0001.sig>
^ permalink raw reply [flat|nested] 6+ messages in thread
* [GIT PULL 2/2] bcm2835-soc-next-2017-08-15
2017-08-17 16:12 ` Eric Anholt
@ 2017-08-17 18:41 ` Florian Fainelli
0 siblings, 0 replies; 6+ messages in thread
From: Florian Fainelli @ 2017-08-17 18:41 UTC (permalink / raw)
To: linux-arm-kernel
On 08/17/2017 09:12 AM, Eric Anholt wrote:
> Florian Fainelli <f.fainelli@gmail.com> writes:
>
>> On 08/15/2017 11:03 AM, Eric Anholt wrote:
>>> The following changes since commit f29c256853b7412961d3ee80ca525bd2530573db:
>>>
>>> ARM: dts: bcm283x: Add 32-bit enable method for SMP (2017-08-14 20:09:44 +0200)
>>>
>>> are available in the git repository at:
>>>
>>> git://github.com/anholt/linux tags/bcm2835-soc-next-2017-08-15
>>>
>>> for you to fetch changes up to 067b437e55a892e3ebb13e40c98825fcfa1e2d99:
>>>
>>> ARM: bcm2836: Send event when onlining other cores (2017-08-15 10:52:26 -0700)
>>>
>>> ----------------------------------------------------------------
>>> This pull request brings in two things.
>>>
>>> One is to use sev() to wake up CPUs that might be sleeping when doing
>>> the custom spin-table boot process in 32-bit mode (new firmware
>>> versions will have the CPUs sleeping waiting for an event instead of
>>> just spinning). However, the irqchip maintainer objected to our SMP
>>> code continuing to live in the driver, so we had to move it to
>>> platsmp.c, and to do that we needed a new SMP enable-method to the DT
>>> for the platsmp.c to attach to (thus the DT cross-merge in this PR).
>>> The platsmp.c patch was acked by irqchip for going through arm-soc.
>>
>> This does make us pull quite a lot of changes, how about I just
>> cherry-pick "ARM: dts: bcm283x: Add 32-bit enable method for SMP" such
>> that the branch in itself is functional as-is, but we don't pull in
>> everything else from devicetree/next?
>
> Then you get the commit duplicated in the history, which people
> generally dislike even more. Also, it depends on the arm64->arm move,
> so you'd need that as well.
Alright, merged and now submitted, thanks! --
--
Florian
^ permalink raw reply [flat|nested] 6+ messages in thread
* [GIT PULL 1/2] bcm2835-dt-next-2017-08-15
2017-08-15 18:03 [GIT PULL 1/2] bcm2835-dt-next-2017-08-15 Eric Anholt
2017-08-15 18:03 ` [GIT PULL 2/2] bcm2835-soc-next-2017-08-15 Eric Anholt
@ 2017-08-17 1:11 ` Florian Fainelli
1 sibling, 0 replies; 6+ messages in thread
From: Florian Fainelli @ 2017-08-17 1:11 UTC (permalink / raw)
To: linux-arm-kernel
On 08/15/2017 11:03 AM, Eric Anholt wrote:
> The following changes since commit ad41eacc11046fe6a199cffb6663bcd9c90df2f8:
>
> Merge tag 'bcm2835-dt-next-2017-08-07' into devicetree/next (2017-08-07 10:45:35 -0700)
>
> are available in the git repository at:
>
> git://github.com/anholt/linux tags/bcm2835-dt-next-2017-08-15
>
> for you to fetch changes up to f29c256853b7412961d3ee80ca525bd2530573db:
>
> ARM: dts: bcm283x: Add 32-bit enable method for SMP (2017-08-14 20:09:44 +0200)
>
> ----------------------------------------------------------------
> This pull request brings in a new SMP enable-method compat string,
> which is needed to move the 32-bit SMP boot code out of the irqchip.
>
> ----------------------------------------------------------------
> Stefan Wahren (2):
> dt-bindings: arm: add SMP enable-method for BCM2836
> ARM: dts: bcm283x: Add 32-bit enable method for SMP
Merged, thanks Eric!
--
Florian
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-08-17 18:41 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-08-15 18:03 [GIT PULL 1/2] bcm2835-dt-next-2017-08-15 Eric Anholt
2017-08-15 18:03 ` [GIT PULL 2/2] bcm2835-soc-next-2017-08-15 Eric Anholt
2017-08-17 1:26 ` Florian Fainelli
2017-08-17 16:12 ` Eric Anholt
2017-08-17 18:41 ` Florian Fainelli
2017-08-17 1:11 ` [GIT PULL 1/2] bcm2835-dt-next-2017-08-15 Florian Fainelli
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).