LinuxLists.cc - [GIT PULL 0/3] msm changes for 3.11

2013-06-14 17:58:08

Subject: [GIT PULL 0/3] msm changes for 3.11

The following three pull requests are for the MSM tree for 3.11. In
addition to cleanups and fixes, there is starting to be some work
toward getting full clock support in the MSM tree.

2013-06-14 17:57:21

by David Brown

[permalink] [raw]

Subject: [GIT PULL 1/3] msm cleanups for 3.11

2013-06-14 17:57:37

by David Brown

[permalink] [raw]

Subject: [GIT PULL 2/3] msm fixes for 3.11

2013-06-14 17:57:36

by David Brown

[permalink] [raw]

Subject: [GIT PULL 2/3] msm fixes for 3.11

2013-06-14 19:53:00

by David Brown

[permalink] [raw]

Subject: [GIT PULL 3/3] msm clock for 3.11

The following changes since commit f722406faae2d073cc1d01063d1123c35425939e:

Linux 3.10-rc1 (2013-05-11 17:14:08 -0700)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git tags/msm-clock-for-3.11

for you to fetch changes up to f54c1c11053d8aaf318a096b8b332fd41a394a66:

ARM: msm: Migrate to common clock framework (2013-06-12 14:43:31 -0700)

----------------------------------------------------------------
MSM clock updates for 3.11.

Per Stephen Boyd's coverletter:

This patchset moves the existing MSM clock code and affected drivers
to the common clock framework. A prerequisite of moving to the common
clock framework is to use clk_prepare() and clk_enable() so the first
few patches migrate drivers to that call (clk_prepare() is a no-op on
MSM right now). It also removes some custom clock APIs that MSM
provides and finally moves the proc_comm clock code to the common
struct clk.

This patch series will be used as the foundation of the MSM 8660/8960
clock code that I plan to send out after this series.

----------------------------------------------------------------
Stephen Boyd (12):
msm_serial: Convert to clk_prepare/unprepare
msm_serial: Use devm_clk_get() and properly return errors
usb: otg: msm: Convert to clk_prepare/unprepare
msm_sdcc: Convert to clk_prepare/unprepare
msm: iommu: Convert to clk_prepare/unprepare
msm: iommu: Use clk_set_rate() instead of clk_set_min_rate()
ARM: msm: Remove custom clk_set_flags() API
ARM: msm: Remove custom clk_set_{max,min}_rate() API
ARM: msm: Remove clock-7x30.h include file
ARM: msm: Prepare clk_get() users in mach-msm for clock-pcom driver
ARM: msm: Make proc_comm clock control into a platform driver
ARM: msm: Migrate to common clock framework

arch/arm/Kconfig | 2 +-
arch/arm/mach-msm/Makefile | 10 +-
arch/arm/mach-msm/board-halibut.c | 2 +-
arch/arm/mach-msm/board-msm7x30.c | 2 +-
arch/arm/mach-msm/board-qsd8x50.c | 2 +-
arch/arm/mach-msm/board-trout-panel.c | 19 ++--
arch/arm/mach-msm/board-trout.c | 3 +-
arch/arm/mach-msm/clock-7x30.h | 155 ------------------------------
arch/arm/mach-msm/clock-debug.c | 130 --------------------------
arch/arm/mach-msm/clock-pcom.c | 149 ++++++++++++++++++-----------
arch/arm/mach-msm/clock-pcom.h | 31 +++---
arch/arm/mach-msm/clock.c | 166 +--------------------------------
arch/arm/mach-msm/clock.h | 51 +++-------
arch/arm/mach-msm/devices-msm7x00.c | 12 ++-
arch/arm/mach-msm/devices-msm7x30.c | 14 ++-
arch/arm/mach-msm/devices-qsd8x50.c | 11 ++-
arch/arm/mach-msm/devices.h | 15 +--
arch/arm/mach-msm/dma.c | 5 +-
arch/arm/mach-msm/include/mach/board.h | 5 -
arch/arm/mach-msm/include/mach/clk.h | 9 --
drivers/iommu/msm_iommu_dev.c | 20 ++--
drivers/mmc/host/msm_sdcc.c | 14 ++-
drivers/tty/serial/msm_serial.c | 35 +++----
drivers/usb/phy/phy-msm-usb.c | 38 ++++----
24 files changed, 241 insertions(+), 659 deletions(-)
delete mode 100644 arch/arm/mach-msm/clock-7x30.h
delete mode 100644 arch/arm/mach-msm/clock-debug.c

--
sent by an employee of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation

2013-06-15 01:21:09

by Olof Johansson

[permalink] [raw]

Subject: Re: [GIT PULL 1/3] msm cleanups for 3.11

On Fri, Jun 14, 2013 at 10:56:53AM -0700, David Brown wrote:
> The following changes since commit f722406faae2d073cc1d01063d1123c35425939e:
>
> Linux 3.10-rc1 (2013-05-11 17:14:08 -0700)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git tags/msm-cleanup-for-3.11
>
> for you to fetch changes up to 1aa3d1a3c7d235c47e30c7c8c6b5ef02fb1536b3:
>
> mfd: ssbi: Use devm_* and simplify code (2013-06-12 14:50:12 -0700)
>
> ----------------------------------------------------------------
> Cleanups for MSM for 3.11
>
> These are a handful of cleanups to the MSM tree. The gpio cleanups
> get us closer to having proper pinmux and gpio support.

Pulled, thanks.

-Olof

2013-06-15 01:26:13

by Olof Johansson

[permalink] [raw]

Subject: Re: [GIT PULL 2/3] msm fixes for 3.11

On Fri, Jun 14, 2013 at 10:56:55AM -0700, David Brown wrote:
> The following changes since commit f722406faae2d073cc1d01063d1123c35425939e:
>
> Linux 3.10-rc1 (2013-05-11 17:14:08 -0700)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git tags/msm-fix-for-3.11
>
> for you to fetch changes up to 7ba655fc965b073292349fa49fb9d16d701185bc:
>
> gpio: msm-v1: Remove errant __devinit to fix compile (2013-06-12 14:49:06 -0700)
>
> ----------------------------------------------------------------
> Some minor fixes for MSM for 3.11
>
> I don't expect these to be necessary for stable, since the fixes are
> to recently added code. The strncpy fix is only in debug code that
> isn't normally compiled or used (and is being removed in upcoming
> patches).
>
> ----------------------------------------------------------------
> Chen Gang (1):
> arch: arm: mach-msm: using strlcpy instead of strncpy
>
> Stephen Boyd (3):
> ARM: dts: msm: Fix bad register addresses

Hmm. I see that the msm-hsuart device nodes completely lack reg entries. That's
considerably more important to fix than the cosmetic unit address that's not
even needed unless two nodes happen to have the same name.

I ended up pulling this in underneath of the cleanup branch to resolve the
add/change conflicts there.

-Olof

2013-06-15 01:35:43

by Olof Johansson

[permalink] [raw]

Subject: Re: [GIT PULL 3/3] msm clock for 3.11

On Fri, Jun 14, 2013 at 12:52:55PM -0700, David Brown wrote:
> The following changes since commit f722406faae2d073cc1d01063d1123c35425939e:
>
> Linux 3.10-rc1 (2013-05-11 17:14:08 -0700)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git tags/msm-clock-for-3.11
>
> for you to fetch changes up to f54c1c11053d8aaf318a096b8b332fd41a394a66:
>
> ARM: msm: Migrate to common clock framework (2013-06-12 14:43:31 -0700)
>
> ----------------------------------------------------------------
> MSM clock updates for 3.11.
>
> Per Stephen Boyd's coverletter:
>
> This patchset moves the existing MSM clock code and affected drivers
> to the common clock framework. A prerequisite of moving to the common
> clock framework is to use clk_prepare() and clk_enable() so the first
> few patches migrate drivers to that call (clk_prepare() is a no-op on
> MSM right now). It also removes some custom clock APIs that MSM
> provides and finally moves the proc_comm clock code to the common
> struct clk.
>
> This patch series will be used as the foundation of the MSM 8660/8960
> clock code that I plan to send out after this series.
>
> ----------------------------------------------------------------
> Stephen Boyd (12):
> msm_serial: Convert to clk_prepare/unprepare
> msm_serial: Use devm_clk_get() and properly return errors
> usb: otg: msm: Convert to clk_prepare/unprepare
> msm_sdcc: Convert to clk_prepare/unprepare
> msm: iommu: Convert to clk_prepare/unprepare
> msm: iommu: Use clk_set_rate() instead of clk_set_min_rate()
> ARM: msm: Remove custom clk_set_flags() API
> ARM: msm: Remove custom clk_set_{max,min}_rate() API
> ARM: msm: Remove clock-7x30.h include file
> ARM: msm: Prepare clk_get() users in mach-msm for clock-pcom driver
> ARM: msm: Make proc_comm clock control into a platform driver
> ARM: msm: Migrate to common clock framework

I don't see a single ack from any of the driver subsystem maintainers for
serial, usb or iommu. Some of them have been acked though, for example Felipe
acked the USB one on the mailing list.

I also didn't see Greg cc:d on the serial patches, which would explain why
there was no ack for them.

Care to repost/collect/rebuild this branch, please? It's a great cleanup and
I'd be happy to take it even if it ends up coming in after -rc6.

-Olof

2013-06-17 17:18:51

by Stephen Boyd

[permalink] [raw]

Subject: Re: [GIT PULL 3/3] msm clock for 3.11

On 06/14/13 18:35, Olof Johansson wrote:
> On Fri, Jun 14, 2013 at 12:52:55PM -0700, David Brown wrote:
>> The following changes since commit f722406faae2d073cc1d01063d1123c35425939e:
>>
>> Linux 3.10-rc1 (2013-05-11 17:14:08 -0700)
>>
>> are available in the git repository at:
>>
>> git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git tags/msm-clock-for-3.11
>>
>> for you to fetch changes up to f54c1c11053d8aaf318a096b8b332fd41a394a66:
>>
>> ARM: msm: Migrate to common clock framework (2013-06-12 14:43:31 -0700)
>>
>> ----------------------------------------------------------------
>> MSM clock updates for 3.11.
>>
>> Per Stephen Boyd's coverletter:
>>
>> This patchset moves the existing MSM clock code and affected drivers
>> to the common clock framework. A prerequisite of moving to the common
>> clock framework is to use clk_prepare() and clk_enable() so the first
>> few patches migrate drivers to that call (clk_prepare() is a no-op on
>> MSM right now). It also removes some custom clock APIs that MSM
>> provides and finally moves the proc_comm clock code to the common
>> struct clk.
>>
>> This patch series will be used as the foundation of the MSM 8660/8960
>> clock code that I plan to send out after this series.
>>
>> ----------------------------------------------------------------
>> Stephen Boyd (12):
>> msm_serial: Convert to clk_prepare/unprepare
>> msm_serial: Use devm_clk_get() and properly return errors
>> usb: otg: msm: Convert to clk_prepare/unprepare
>> msm_sdcc: Convert to clk_prepare/unprepare
>> msm: iommu: Convert to clk_prepare/unprepare
>> msm: iommu: Use clk_set_rate() instead of clk_set_min_rate()
>> ARM: msm: Remove custom clk_set_flags() API
>> ARM: msm: Remove custom clk_set_{max,min}_rate() API
>> ARM: msm: Remove clock-7x30.h include file
>> ARM: msm: Prepare clk_get() users in mach-msm for clock-pcom driver
>> ARM: msm: Make proc_comm clock control into a platform driver
>> ARM: msm: Migrate to common clock framework
> I don't see a single ack from any of the driver subsystem maintainers for
> serial, usb or iommu. Some of them have been acked though, for example Felipe
> acked the USB one on the mailing list.
>
> I also didn't see Greg cc:d on the serial patches, which would explain why
> there was no ack for them.
>
> Care to repost/collect/rebuild this branch, please? It's a great cleanup and
> I'd be happy to take it even if it ends up coming in after -rc6.

MAINTAINERS shows the MSM maintainers for the serial and mmc drivers so
I sent them to David. The iommu driver didn't seem to have any
maintainers entry so I just sent it off to David as well.

It wasn't clear to me that we needed to Cc higher level maintainers at
all. Perhaps we should clarify this in SubmittingPatches?

---8<-----

diff --git a/Documentation/SubmittingPatches b/Documentation/SubmittingPatches
index 6e97e73..e87084f 100644
--- a/Documentation/SubmittingPatches
+++ b/Documentation/SubmittingPatches
@@ -152,6 +152,10 @@ if your change applies to a specific subsystem of the kernel, with
an assigned maintainer. If so, e-mail that person. The script
scripts/get_maintainer.pl can be very useful at this step.

+If there is a specific maintainer and a more general maintainer it's
+suggested that you email the more specific maintainer and Cc the more
+general maintainer and acquire their ack.
+
If no maintainer is listed, or the maintainer does not respond, send
your patch to the primary Linux kernel developer's mailing list,
[email protected]. Most kernel developers monitor this

--
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
hosted by The Linux Foundation

2013-06-17 17:41:43

by Olof Johansson

[permalink] [raw]

Subject: Re: [GIT PULL 3/3] msm clock for 3.11

On Mon, Jun 17, 2013 at 10:18 AM, Stephen Boyd <[email protected]> wrote:
> On 06/14/13 18:35, Olof Johansson wrote:
>> On Fri, Jun 14, 2013 at 12:52:55PM -0700, David Brown wrote:
>>> The following changes since commit f722406faae2d073cc1d01063d1123c35425939e:
>>>
>>> Linux 3.10-rc1 (2013-05-11 17:14:08 -0700)
>>>
>>> are available in the git repository at:
>>>
>>> git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git tags/msm-clock-for-3.11
>>>
>>> for you to fetch changes up to f54c1c11053d8aaf318a096b8b332fd41a394a66:
>>>
>>> ARM: msm: Migrate to common clock framework (2013-06-12 14:43:31 -0700)
>>>
>>> ----------------------------------------------------------------
>>> MSM clock updates for 3.11.
>>>
>>> Per Stephen Boyd's coverletter:
>>>
>>> This patchset moves the existing MSM clock code and affected drivers
>>> to the common clock framework. A prerequisite of moving to the common
>>> clock framework is to use clk_prepare() and clk_enable() so the first
>>> few patches migrate drivers to that call (clk_prepare() is a no-op on
>>> MSM right now). It also removes some custom clock APIs that MSM
>>> provides and finally moves the proc_comm clock code to the common
>>> struct clk.
>>>
>>> This patch series will be used as the foundation of the MSM 8660/8960
>>> clock code that I plan to send out after this series.
>>>
>>> ----------------------------------------------------------------
>>> Stephen Boyd (12):
>>> msm_serial: Convert to clk_prepare/unprepare
>>> msm_serial: Use devm_clk_get() and properly return errors
>>> usb: otg: msm: Convert to clk_prepare/unprepare
>>> msm_sdcc: Convert to clk_prepare/unprepare
>>> msm: iommu: Convert to clk_prepare/unprepare
>>> msm: iommu: Use clk_set_rate() instead of clk_set_min_rate()
>>> ARM: msm: Remove custom clk_set_flags() API
>>> ARM: msm: Remove custom clk_set_{max,min}_rate() API
>>> ARM: msm: Remove clock-7x30.h include file
>>> ARM: msm: Prepare clk_get() users in mach-msm for clock-pcom driver
>>> ARM: msm: Make proc_comm clock control into a platform driver
>>> ARM: msm: Migrate to common clock framework
>> I don't see a single ack from any of the driver subsystem maintainers for
>> serial, usb or iommu. Some of them have been acked though, for example Felipe
>> acked the USB one on the mailing list.
>>
>> I also didn't see Greg cc:d on the serial patches, which would explain why
>> there was no ack for them.
>>
>> Care to repost/collect/rebuild this branch, please? It's a great cleanup and
>> I'd be happy to take it even if it ends up coming in after -rc6.
>
> MAINTAINERS shows the MSM maintainers for the serial and mmc drivers so
> I sent them to David. The iommu driver didn't seem to have any
> maintainers entry so I just sent it off to David as well.
>
> It wasn't clear to me that we needed to Cc higher level maintainers at
> all. Perhaps we should clarify this in SubmittingPatches?

get_maintainer is pretty clear on it, pointing out all maintainers up the chain.

This is normally not a problem when the maintainer sends code on up
the subsystem tree (i.e. to Greg in the case of serial patches). What
made me want an ack in this case is because the serial patches came in
for the arm-soc tree.

-Olof

2013-06-17 20:26:28

by David Brown

[permalink] [raw]

Subject: Re: [GIT PULL 2/3] msm fixes for 3.11

On Fri, Jun 14, 2013 at 06:26:17PM -0700, Olof Johansson wrote:

>> Stephen Boyd (3):
>> ARM: dts: msm: Fix bad register addresses
>
>Hmm. I see that the msm-hsuart device nodes completely lack reg entries. That's
>considerably more important to fix than the cosmetic unit address that's not
>even needed unless two nodes happen to have the same name.

I'm not seeing the missing reg entries in anyone's tree.

However, it appears that both of us resolved the merge conflict
differently, and both did it incorrectly.

How would you like this to be fixed? Should I just send you a patch
based off of the current soc tree?

Thanks,
David

--
sent by an employee of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation

2013-06-17 20:31:52

by Olof Johansson

[permalink] [raw]

Subject: Re: [GIT PULL 2/3] msm fixes for 3.11

On Mon, Jun 17, 2013 at 1:26 PM, David Brown <[email protected]> wrote:
> On Fri, Jun 14, 2013 at 06:26:17PM -0700, Olof Johansson wrote:
>
>>> Stephen Boyd (3):
>>> ARM: dts: msm: Fix bad register addresses
>>
>>
>> Hmm. I see that the msm-hsuart device nodes completely lack reg entries.
>> That's
>> considerably more important to fix than the cosmetic unit address that's
>> not
>> even needed unless two nodes happen to have the same name.
>
>
> I'm not seeing the missing reg entries in anyone's tree.

Me neither. Hm. I wonder what I was looking at when I said that. Nevermind.

> However, it appears that both of us resolved the merge conflict
> differently, and both did it incorrectly.
>
> How would you like this to be fixed? Should I just send you a patch
> based off of the current soc tree?

Yes, just send a patch, not a pull request.

-Olof

2013-06-24 21:00:49

by David Brown

[permalink] [raw]

Subject: [GIT PULL v2] msm clock for 3.11

This pull request differs from the previous one for the clock code by:

- Gathered additional Acked-by lines.
- A small #include fixup found by Stephen Boyd

The only Ack not received was from Chris Ball, who is CC'd on this
request.

The following changes since commit f722406faae2d073cc1d01063d1123c35425939e:

Linux 3.10-rc1 (2013-05-11 17:14:08 -0700)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git tags/msm-clock-for-3.11b

for you to fetch changes up to 8cc7f5338e729b79194e6c22e3c794faaef974b8:

ARM: msm: Migrate to common clock framework (2013-06-24 13:08:05 -0700)

----------------------------------------------------------------
MSM clock updates for 3.11.

Per Stephen Boyd's coverletter:

Resending to collect higher level maintainer acks per Olof's request.
The plan is to push this patchset through MSM to the arm-soc tree.

This patchset moves the existing MSM clock code and affected drivers
to the common clock framework. A prerequisite of moving to the common
clock framework is to use clk_prepare() and clk_enable() so the first
few patches migrate drivers to that call (clk_prepare() is a no-op on
MSM right now). It also removes some custom clock APIs that MSM
provides and finally moves the proc_comm clock code to the common
struct clk.

This patch series will be used as the foundation of the MSM 8660/8960
clock code that I plan to send out after this series.

----------------------------------------------------------------
Stephen Boyd (12):
msm_serial: Convert to clk_prepare/unprepare
msm_serial: Use devm_clk_get() and properly return errors
usb: otg: msm: Convert to clk_prepare/unprepare
msm_sdcc: Convert to clk_prepare/unprepare
msm: iommu: Convert to clk_prepare/unprepare
msm: iommu: Use clk_set_rate() instead of clk_set_min_rate()
ARM: msm: Remove custom clk_set_flags() API
ARM: msm: Remove custom clk_set_{max,min}_rate() API
ARM: msm: Remove clock-7x30.h include file
ARM: msm: Prepare clk_get() users in mach-msm for clock-pcom driver
ARM: msm: Make proc_comm clock control into a platform driver
ARM: msm: Migrate to common clock framework

arch/arm/Kconfig | 2 +-
arch/arm/mach-msm/Makefile | 10 +-
arch/arm/mach-msm/board-halibut.c | 2 +-
arch/arm/mach-msm/board-msm7x30.c | 2 +-
arch/arm/mach-msm/board-qsd8x50.c | 2 +-
arch/arm/mach-msm/board-trout-panel.c | 19 ++--
arch/arm/mach-msm/board-trout.c | 3 +-
arch/arm/mach-msm/clock-7x30.h | 155 ------------------------------
arch/arm/mach-msm/clock-debug.c | 130 --------------------------
arch/arm/mach-msm/clock-pcom.c | 149 ++++++++++++++++++-----------
arch/arm/mach-msm/clock-pcom.h | 31 +++---
arch/arm/mach-msm/clock.c | 166 +--------------------------------
arch/arm/mach-msm/clock.h | 51 +++-------
arch/arm/mach-msm/devices-msm7x00.c | 12 ++-
arch/arm/mach-msm/devices-msm7x30.c | 15 ++-
arch/arm/mach-msm/devices-qsd8x50.c | 12 ++-
arch/arm/mach-msm/devices.h | 15 +--
arch/arm/mach-msm/dma.c | 5 +-
arch/arm/mach-msm/include/mach/board.h | 5 -
arch/arm/mach-msm/include/mach/clk.h | 9 --
drivers/iommu/msm_iommu_dev.c | 20 ++--
drivers/mmc/host/msm_sdcc.c | 14 ++-
drivers/tty/serial/msm_serial.c | 35 +++----
drivers/usb/phy/phy-msm-usb.c | 38 ++++----
24 files changed, 243 insertions(+), 659 deletions(-)
delete mode 100644 arch/arm/mach-msm/clock-7x30.h
delete mode 100644 arch/arm/mach-msm/clock-debug.c

2013-06-24 21:02:56

by Chris Ball

[permalink] [raw]

Subject: Re: [GIT PULL v2] msm clock for 3.11

Hi,

On Mon, Jun 24 2013, David Brown wrote:
> This pull request differs from the previous one for the clock code by:
>
> - Gathered additional Acked-by lines.
> - A small #include fixup found by Stephen Boyd
>
> The only Ack not received was from Chris Ball, who is CC'd on this
> request.

Sorry about that. For msm_sdcc.c:

Acked-by: Chris Ball <[email protected]>

- Chris.
--
Chris Ball <[email protected]> <http://printf.net/>

2013-06-28 00:06:14

by Olof Johansson

[permalink] [raw]

Subject: Re: [GIT PULL v2] msm clock for 3.11

On Mon, Jun 24, 2013 at 02:00:28PM -0700, David Brown wrote:
> This pull request differs from the previous one for the clock code by:
>
> - Gathered additional Acked-by lines.
> - A small #include fixup found by Stephen Boyd
>
> The only Ack not received was from Chris Ball, who is CC'd on this
> request.
>
> The following changes since commit f722406faae2d073cc1d01063d1123c35425939e:
>
> Linux 3.10-rc1 (2013-05-11 17:14:08 -0700)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git tags/msm-clock-for-3.11b

Thanks, pulled into next/late. This conflicts with a fixes-non-critical
fix to removed code, trivially resolved.

-Olof