* [GIT PULL] soc: Keystone SOC Navigator drivers for 3.18
@ 2014-09-04 21:13 Santosh Shilimkar
2014-09-24 4:43 ` Olof Johansson
0 siblings, 1 reply; 6+ messages in thread
From: Santosh Shilimkar @ 2014-09-04 21:13 UTC (permalink / raw)
To: linux-arm-kernel
Hi Arm-soc folks,
Please pull below Keystone SOC drivers. They have been on the list for review
for last few merge windows. I got handful of comments on DTS bindings which
has been already addressed. This should ungate me to get network support for
Keystone which is missing in mainline.
The following changes since commit 7d1311b93e58ed55f3a31cc8f94c4b8fe988a2b9:
Linux 3.17-rc1 (2014-08-16 10:40:26 -0600)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git tags/drivers-soc-ti
for you to fetch changes up to e9e7494bdcc7926237823253707691d0f3787be2:
MAINTAINERS: Add Keystone Multicore Navigator drivers entry (2014-09-04 16:40:16 -0400)
----------------------------------------------------------------
Keystone SOC Navigator drivers for 3.18
The Keystone Multi-core Navigator contains QMSS and packet DMA
subsystems which interwork together to form the Navigator cloud
used by various subsystems like NetCP, SRIO, SideBand Crypto
engines etc.
----------------------------------------------------------------
Sandeep Nair (3):
firmware: add Keystone QMSS PDSP accumulator firmware blob
Documentation: dt: soc: add Keystone Navigator QMSS bindings
soc: ti: add Keystone Navigator QMSS driver
Santosh Shilimkar (3):
Documentation: dt: soc: add Keystone Navigator DMA bindings
soc: ti: add Keystone Navigator DMA support
MAINTAINERS: Add Keystone Multicore Navigator drivers entry
.../bindings/soc/ti/keystone-navigator-dma.txt | 111 ++
.../bindings/soc/ti/keystone-navigator-qmss.txt | 232 +++
MAINTAINERS | 9 +
drivers/Kconfig | 2 +
drivers/soc/Kconfig | 1 +
drivers/soc/Makefile | 1 +
drivers/soc/ti/Kconfig | 31 +
drivers/soc/ti/Makefile | 5 +
drivers/soc/ti/knav_dma.c | 815 +++++++++
drivers/soc/ti/knav_qmss.h | 386 +++++
drivers/soc/ti/knav_qmss_acc.c | 591 +++++++
drivers/soc/ti/knav_qmss_queue.c | 1816 ++++++++++++++++++++
firmware/Makefile | 1 +
.../keystone/qmss_pdsp_acc48_k2_le_1_0_0_8.fw.ihex | 110 ++
include/linux/soc/ti/knav_dma.h | 175 ++
include/linux/soc/ti/knav_qmss.h | 90 +
16 files changed, 4376 insertions(+)
create mode 100644 Documentation/devicetree/bindings/soc/ti/keystone-navigator-dma.txt
create mode 100644 Documentation/devicetree/bindings/soc/ti/keystone-navigator-qmss.txt
create mode 100644 drivers/soc/ti/Kconfig
create mode 100644 drivers/soc/ti/Makefile
create mode 100644 drivers/soc/ti/knav_dma.c
create mode 100644 drivers/soc/ti/knav_qmss.h
create mode 100644 drivers/soc/ti/knav_qmss_acc.c
create mode 100644 drivers/soc/ti/knav_qmss_queue.c
create mode 100644 firmware/keystone/qmss_pdsp_acc48_k2_le_1_0_0_8.fw.ihex
create mode 100644 include/linux/soc/ti/knav_dma.h
create mode 100644 include/linux/soc/ti/knav_qmss.h
^ permalink raw reply [flat|nested] 6+ messages in thread* [GIT PULL] soc: Keystone SOC Navigator drivers for 3.18
2014-09-04 21:13 [GIT PULL] soc: Keystone SOC Navigator drivers for 3.18 Santosh Shilimkar
@ 2014-09-24 4:43 ` Olof Johansson
2014-09-24 13:57 ` Santosh Shilimkar
0 siblings, 1 reply; 6+ messages in thread
From: Olof Johansson @ 2014-09-24 4:43 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Sep 04, 2014 at 05:13:54PM -0400, Santosh Shilimkar wrote:
> Hi Arm-soc folks,
>
> Please pull below Keystone SOC drivers. They have been on the list for review
> for last few merge windows. I got handful of comments on DTS bindings which
> has been already addressed. This should ungate me to get network support for
> Keystone which is missing in mainline.
>
> The following changes since commit 7d1311b93e58ed55f3a31cc8f94c4b8fe988a2b9:
>
> Linux 3.17-rc1 (2014-08-16 10:40:26 -0600)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git tags/drivers-soc-ti
>
> for you to fetch changes up to e9e7494bdcc7926237823253707691d0f3787be2:
>
> MAINTAINERS: Add Keystone Multicore Navigator drivers entry (2014-09-04 16:40:16 -0400)
>
> ----------------------------------------------------------------
> Keystone SOC Navigator drivers for 3.18
>
> The Keystone Multi-core Navigator contains QMSS and packet DMA
> subsystems which interwork together to form the Navigator cloud
> used by various subsystems like NetCP, SRIO, SideBand Crypto
> engines etc.
>
> ----------------------------------------------------------------
> Sandeep Nair (3):
> firmware: add Keystone QMSS PDSP accumulator firmware blob
> Documentation: dt: soc: add Keystone Navigator QMSS bindings
> soc: ti: add Keystone Navigator QMSS driver
>
> Santosh Shilimkar (3):
> Documentation: dt: soc: add Keystone Navigator DMA bindings
> soc: ti: add Keystone Navigator DMA support
> MAINTAINERS: Add Keystone Multicore Navigator drivers entry
Hi Santosh,
I was going through the queue of merges to do and it seems like Arnd
missed this one.
Before I merge it though -- it looks like the firmware should be added to
the linux-firmware repository instead? We try to avoid adding new firmware
files in the kernel tree these days and get them from there instead...
Can you respin with that fixed, or should I cherry-pick the contents from
this branch instead (all but that patch)?
-Olof
^ permalink raw reply [flat|nested] 6+ messages in thread
* [GIT PULL] soc: Keystone SOC Navigator drivers for 3.18
2014-09-24 4:43 ` Olof Johansson
@ 2014-09-24 13:57 ` Santosh Shilimkar
2014-09-24 17:36 ` Olof Johansson
2014-09-24 19:06 ` [PATCH] drivers/soc: ti: fix build break with modules Olof Johansson
0 siblings, 2 replies; 6+ messages in thread
From: Santosh Shilimkar @ 2014-09-24 13:57 UTC (permalink / raw)
To: linux-arm-kernel
On Wednesday 24 September 2014 12:43 AM, Olof Johansson wrote:
> On Thu, Sep 04, 2014 at 05:13:54PM -0400, Santosh Shilimkar wrote:
>> Hi Arm-soc folks,
>>
>> Please pull below Keystone SOC drivers. They have been on the list for review
>> for last few merge windows. I got handful of comments on DTS bindings which
>> has been already addressed. This should ungate me to get network support for
>> Keystone which is missing in mainline.
>>
>> The following changes since commit 7d1311b93e58ed55f3a31cc8f94c4b8fe988a2b9:
>>
>> Linux 3.17-rc1 (2014-08-16 10:40:26 -0600)
>>
>> are available in the git repository at:
>>
>> git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git tags/drivers-soc-ti
>>
>> for you to fetch changes up to e9e7494bdcc7926237823253707691d0f3787be2:
>>
>> MAINTAINERS: Add Keystone Multicore Navigator drivers entry (2014-09-04 16:40:16 -0400)
>>
>> ----------------------------------------------------------------
>> Keystone SOC Navigator drivers for 3.18
>>
>> The Keystone Multi-core Navigator contains QMSS and packet DMA
>> subsystems which interwork together to form the Navigator cloud
>> used by various subsystems like NetCP, SRIO, SideBand Crypto
>> engines etc.
>>
>> ----------------------------------------------------------------
>> Sandeep Nair (3):
>> firmware: add Keystone QMSS PDSP accumulator firmware blob
>> Documentation: dt: soc: add Keystone Navigator QMSS bindings
>> soc: ti: add Keystone Navigator QMSS driver
>>
>> Santosh Shilimkar (3):
>> Documentation: dt: soc: add Keystone Navigator DMA bindings
>> soc: ti: add Keystone Navigator DMA support
>> MAINTAINERS: Add Keystone Multicore Navigator drivers entry
>
> Hi Santosh,
>
> I was going through the queue of merges to do and it seems like Arnd
> missed this one.
>
> Before I merge it though -- it looks like the firmware should be added to
> the linux-firmware repository instead? We try to avoid adding new firmware
> files in the kernel tree these days and get them from there instead...
>
Right. Typically firmware files in kernel are not encoraged. This is infrastructure
driver so the firmware is needed for it to work. I will try to get that
patch via linux-firmware tree.
> Can you respin with that fixed, or should I cherry-pick the contents from
> this branch instead (all but that patch)?
>
Just refreshed the branch and updated the new tag.
git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git
tags/drivers-soc-ti-v2
Can you please pull that one ?
Thanks !!
regards,
Santosh
^ permalink raw reply [flat|nested] 6+ messages in thread
* [GIT PULL] soc: Keystone SOC Navigator drivers for 3.18
2014-09-24 13:57 ` Santosh Shilimkar
@ 2014-09-24 17:36 ` Olof Johansson
2014-09-24 19:06 ` [PATCH] drivers/soc: ti: fix build break with modules Olof Johansson
1 sibling, 0 replies; 6+ messages in thread
From: Olof Johansson @ 2014-09-24 17:36 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Sep 24, 2014 at 09:57:05AM -0400, Santosh Shilimkar wrote:
> On Wednesday 24 September 2014 12:43 AM, Olof Johansson wrote:
> > On Thu, Sep 04, 2014 at 05:13:54PM -0400, Santosh Shilimkar wrote:
> >> Hi Arm-soc folks,
> >>
> >> Please pull below Keystone SOC drivers. They have been on the list for review
> >> for last few merge windows. I got handful of comments on DTS bindings which
> >> has been already addressed. This should ungate me to get network support for
> >> Keystone which is missing in mainline.
> >>
> >> The following changes since commit 7d1311b93e58ed55f3a31cc8f94c4b8fe988a2b9:
> >>
> >> Linux 3.17-rc1 (2014-08-16 10:40:26 -0600)
> >>
> >> are available in the git repository at:
> >>
> >> git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git tags/drivers-soc-ti
> >>
> >> for you to fetch changes up to e9e7494bdcc7926237823253707691d0f3787be2:
> >>
> >> MAINTAINERS: Add Keystone Multicore Navigator drivers entry (2014-09-04 16:40:16 -0400)
> >>
> >> ----------------------------------------------------------------
> >> Keystone SOC Navigator drivers for 3.18
> >>
> >> The Keystone Multi-core Navigator contains QMSS and packet DMA
> >> subsystems which interwork together to form the Navigator cloud
> >> used by various subsystems like NetCP, SRIO, SideBand Crypto
> >> engines etc.
> >>
> >> ----------------------------------------------------------------
> >> Sandeep Nair (3):
> >> firmware: add Keystone QMSS PDSP accumulator firmware blob
> >> Documentation: dt: soc: add Keystone Navigator QMSS bindings
> >> soc: ti: add Keystone Navigator QMSS driver
> >>
> >> Santosh Shilimkar (3):
> >> Documentation: dt: soc: add Keystone Navigator DMA bindings
> >> soc: ti: add Keystone Navigator DMA support
> >> MAINTAINERS: Add Keystone Multicore Navigator drivers entry
> >
> > Hi Santosh,
> >
> > I was going through the queue of merges to do and it seems like Arnd
> > missed this one.
> >
> > Before I merge it though -- it looks like the firmware should be added to
> > the linux-firmware repository instead? We try to avoid adding new firmware
> > files in the kernel tree these days and get them from there instead...
> >
> Right. Typically firmware files in kernel are not encoraged. This is infrastructure
> driver so the firmware is needed for it to work. I will try to get that
> patch via linux-firmware tree.
>
> > Can you respin with that fixed, or should I cherry-pick the contents from
> > this branch instead (all but that patch)?
> >
> Just refreshed the branch and updated the new tag.
>
> git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git
> tags/drivers-soc-ti-v2
>
> Can you please pull that one ?
Done, merged.
-Olof
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] drivers/soc: ti: fix build break with modules
2014-09-24 13:57 ` Santosh Shilimkar
2014-09-24 17:36 ` Olof Johansson
@ 2014-09-24 19:06 ` Olof Johansson
2014-09-24 19:32 ` Santosh Shilimkar
1 sibling, 1 reply; 6+ messages in thread
From: Olof Johansson @ 2014-09-24 19:06 UTC (permalink / raw)
To: linux-arm-kernel
Fixes below build break by not switching to stubs when the driver is a module:
drivers/soc/ti/knav_dma.c:418:7: error: redefinition of 'knav_dma_open_channel'
void *knav_dma_open_channel(struct device *dev, const char *name,
^
In file included from drivers/soc/ti/knav_dma.c:26:0:
include/linux/soc/ti/knav_dma.h:165:21: note: previous definition of 'knav_dma_open_channel' was here
static inline void *knav_dma_open_channel(struct device *dev, const char *name,
^
Cc: Santosh Shilimkar <santosh.shilimkar@ti.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
---
include/linux/soc/ti/knav_dma.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/linux/soc/ti/knav_dma.h b/include/linux/soc/ti/knav_dma.h
index e864a3e..dad035c 100644
--- a/include/linux/soc/ti/knav_dma.h
+++ b/include/linux/soc/ti/knav_dma.h
@@ -157,7 +157,7 @@ struct knav_dma_desc {
u32 pad[4];
} ____cacheline_aligned;
-#ifdef CONFIG_KEYSTONE_NAVIGATOR_DMA
+#if IS_ENABLED(CONFIG_KEYSTONE_NAVIGATOR_DMA)
void *knav_dma_open_channel(struct device *dev, const char *name,
struct knav_dma_cfg *config);
void knav_dma_close_channel(void *channel);
--
1.7.10.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH] drivers/soc: ti: fix build break with modules
2014-09-24 19:06 ` [PATCH] drivers/soc: ti: fix build break with modules Olof Johansson
@ 2014-09-24 19:32 ` Santosh Shilimkar
0 siblings, 0 replies; 6+ messages in thread
From: Santosh Shilimkar @ 2014-09-24 19:32 UTC (permalink / raw)
To: linux-arm-kernel
On Wednesday 24 September 2014 03:06 PM, Olof Johansson wrote:
> Fixes below build break by not switching to stubs when the driver is a module:
>
> drivers/soc/ti/knav_dma.c:418:7: error: redefinition of 'knav_dma_open_channel'
> void *knav_dma_open_channel(struct device *dev, const char *name,
> ^
> In file included from drivers/soc/ti/knav_dma.c:26:0:
> include/linux/soc/ti/knav_dma.h:165:21: note: previous definition of 'knav_dma_open_channel' was here
> static inline void *knav_dma_open_channel(struct device *dev, const char *name,
> ^
>
> Cc: Santosh Shilimkar <santosh.shilimkar@ti.com>
> Signed-off-by: Olof Johansson <olof@lixom.net>
> ---
> include/linux/soc/ti/knav_dma.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/include/linux/soc/ti/knav_dma.h b/include/linux/soc/ti/knav_dma.h
> index e864a3e..dad035c 100644
> --- a/include/linux/soc/ti/knav_dma.h
> +++ b/include/linux/soc/ti/knav_dma.h
> @@ -157,7 +157,7 @@ struct knav_dma_desc {
> u32 pad[4];
> } ____cacheline_aligned;
>
> -#ifdef CONFIG_KEYSTONE_NAVIGATOR_DMA
> +#if IS_ENABLED(CONFIG_KEYSTONE_NAVIGATOR_DMA)
> void *knav_dma_open_channel(struct device *dev, const char *name,
> struct knav_dma_cfg *config);
> void knav_dma_close_channel(void *channel);
>
Thanks Olof for fixing it up.
Regards,
Santosh
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2014-09-24 19:32 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-09-04 21:13 [GIT PULL] soc: Keystone SOC Navigator drivers for 3.18 Santosh Shilimkar
2014-09-24 4:43 ` Olof Johansson
2014-09-24 13:57 ` Santosh Shilimkar
2014-09-24 17:36 ` Olof Johansson
2014-09-24 19:06 ` [PATCH] drivers/soc: ti: fix build break with modules Olof Johansson
2014-09-24 19:32 ` Santosh Shilimkar
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).