[PATCH v1 1/2] soc: ti: display firmware file name as part of boot log

[PATCH v1 1/2] soc: ti: display firmware file name as part of boot log

[Murali Karicheri]

To help the user, print the PDSP file name as part of
knav_queue_load_pdsp(). This will be useful for users to know what
version of the firmware is loaded to PDSP. Also update the
document for the location of the QMSS accumulator PDSP firmware.

Signed-off-by: Murali Karicheri <m-karicheri2@ti.com>
---
 v1 : fixed firmware file names in documentation
 .../bindings/soc/ti/keystone-navigator-qmss.txt      | 20 +++++++++++++++++++-
 drivers/soc/ti/knav_qmss_queue.c                     |  3 +++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/Documentation/devicetree/bindings/soc/ti/keystone-navigator-qmss.txt b/Documentation/devicetree/bindings/soc/ti/keystone-navigator-qmss.txt
index d8e8cdb..ca0a1a7 100644
--- a/Documentation/devicetree/bindings/soc/ti/keystone-navigator-qmss.txt
+++ b/Documentation/devicetree/bindings/soc/ti/keystone-navigator-qmss.txt
@@ -221,7 +221,7 @@ qmss: qmss at 2a40000 {
 		#size-cells = <1>;
 		ranges;
 		pdsp0 at 0x2a10000 {
-			firmware = "keystone/qmss_pdsp_acc48_k2_le_1_0_0_8.fw";
+			firmware = "k2_qmss_pdsp_acc48_k2_le_1_0_0_9.bin";
 			reg = <0x2a10000 0x1000>,
 			      <0x2a0f000 0x100>,
 			      <0x2a0c000 0x3c8>,
@@ -230,3 +230,21 @@ qmss: qmss at 2a40000 {
 		};
 	};
 }; /* qmss */
+
+Accumulator QMSS Channel using PDSP firmware
+============================================
+The QMSS PDSP firmware support accumulator channel that can monitor a single
+queue or multiple contiguous queues. drivers/soc/ti/knav_qmss_acc.c is the
+driver that interface with the accumulator PDSP. This configures
+accumulator channels defined in DTS (example above) to monitor 1 or 32 queues
+per channel. More description on the firmware is available in CPPI/QMSS Low
+Level Driver document (docs/CPPI_QMSS_LLD_SDS.pdf) at
+	git://git.ti.com/keystone-rtos/qmss-lld.git
+
+k2_qmss_pdsp_acc48_k2_le_1_0_0_9.bin firmware supports upto 48 accumulator
+channels. This firmware is available under firmware folder of the above repo
+under the name acc48_le.bin. To use copy the firmware image to lib/firmware
+folder of the initramfs or ubifs file system as
+k2_qmss_pdsp_acc48_k2_le_1_0_0_9.bin and boot up the kernel. User would see
+"firmware file ks2_qmss_pdsp_acc48_k2_le_1_0_0_9.bin downloaded for PDSP" in
+the boot up log if loading of firmware to PDSP is successful.
diff --git a/drivers/soc/ti/knav_qmss_queue.c b/drivers/soc/ti/knav_qmss_queue.c
index 6d8646d..f26ce99 100644
--- a/drivers/soc/ti/knav_qmss_queue.c
+++ b/drivers/soc/ti/knav_qmss_queue.c
@@ -1526,6 +1526,9 @@ static int knav_queue_load_pdsp(struct knav_device *kdev,
 			pdsp->firmware, pdsp->name);
 		return ret;
 	}
+	dev_info(kdev->dev, "firmware file %s downloaded for PDSP\n",
+		 pdsp->firmware);
+
 	writel_relaxed(pdsp->id + 1, pdsp->command + 0x18);
 	/* download the firmware */
 	fwdata = (u32 *)fw->data;
-- 
1.9.1

[PATCH v1 2/2] ARM: dts: keystone: enable accumulator channels

[Murali Karicheri]

Add low priority accumulator channel that can monitor multiple QMSS
queues. User for example could use the accumular queue for Netcp
Rx completion. While at it, also add an extra line end of each top
level node in DTS to make it more readable.

Signed-off-by: Murali Karicheri <m-karicheri2@ti.com>
---
 v1  - No change from initial version
 arch/arm/boot/dts/k2e-netcp.dtsi  | 24 ++++++++++++++++++++++++
 arch/arm/boot/dts/k2hk-netcp.dtsi | 25 +++++++++++++++++++++++++
 arch/arm/boot/dts/k2l-netcp.dtsi  | 24 ++++++++++++++++++++++++
 3 files changed, 73 insertions(+)

diff --git a/arch/arm/boot/dts/k2e-netcp.dtsi b/arch/arm/boot/dts/k2e-netcp.dtsi
index b13b3c9..1818929 100644
--- a/arch/arm/boot/dts/k2e-netcp.dtsi
+++ b/arch/arm/boot/dts/k2e-netcp.dtsi
@@ -72,7 +72,17 @@ qmss: qmss at 2a40000 {
 				qalloc-by-id;
 			};
 		};
+		accumulator {
+			acc-low-0 {
+				qrange = <480 32>;
+				accumulator = <0 47 16 2 50>;
+				interrupts = <0 226 0xf01>;
+				multi-queue;
+				qalloc-by-id;
+			};
+		};
 	};
+
 	descriptor-regions {
 		#address-cells = <1>;
 		#size-cells = <1>;
@@ -83,6 +93,20 @@ qmss: qmss at 2a40000 {
 			link-index = <0x4000>;
 		};
 	};
+
+	pdsps {
+		#address-cells = <1>;
+		#size-cells = <1>;
+		ranges;
+		pdsp0 at 0x2a10000 {
+			firmware = "ks2_qmss_pdsp_acc48_k2_le_1_0_0_9.bin";
+			reg = <0x2a10000 0x1000    /*iram */
+			       0x2a0f000 0x100     /*reg*/
+			       0x2a0c000 0x3c8	   /*intd */
+			       0x2a20000 0x4000>;  /*cmd*/
+			id = <0>;
+		};
+	};
 }; /* qmss */
 
 knav_dmas: knav_dmas at 0 {
diff --git a/arch/arm/boot/dts/k2hk-netcp.dtsi b/arch/arm/boot/dts/k2hk-netcp.dtsi
index 77a32c3..b9941b4 100644
--- a/arch/arm/boot/dts/k2hk-netcp.dtsi
+++ b/arch/arm/boot/dts/k2hk-netcp.dtsi
@@ -47,6 +47,7 @@ qmss: qmss at 2a40000 {
 				    "region", "push", "pop";
 		};
 	};
+
 	queue-pools {
 		qpend {
 			qpend-0 {
@@ -88,7 +89,17 @@ qmss: qmss at 2a40000 {
 				qalloc-by-id;
 			};
 		};
+		accumulator {
+			acc-low-0 {
+				qrange = <480 32>;
+				accumulator = <0 47 16 2 50>;
+				interrupts = <0 226 0xf01>;
+				multi-queue;
+				qalloc-by-id;
+			};
+		};
 	};
+
 	descriptor-regions {
 		#address-cells = <1>;
 		#size-cells = <1>;
@@ -99,6 +110,20 @@ qmss: qmss at 2a40000 {
 			link-index = <0x4000>;
 		};
 	};
+
+	pdsps {
+		#address-cells = <1>;
+		#size-cells = <1>;
+		ranges;
+		pdsp0 at 0x2a10000 {
+			firmware = "ks2_qmss_pdsp_acc48_k2_le_1_0_0_9.bin";
+			reg = <0x2a10000 0x1000    /*iram */
+			       0x2a0f000 0x100     /*reg*/
+			       0x2a0c000 0x3c8	   /*intd */
+			       0x2a20000 0x4000>;  /*cmd*/
+			id = <0>;
+		};
+	};
 }; /* qmss */
 
 knav_dmas: knav_dmas at 0 {
diff --git a/arch/arm/boot/dts/k2l-netcp.dtsi b/arch/arm/boot/dts/k2l-netcp.dtsi
index 6b95284..8d7ddb3 100644
--- a/arch/arm/boot/dts/k2l-netcp.dtsi
+++ b/arch/arm/boot/dts/k2l-netcp.dtsi
@@ -72,7 +72,16 @@ qmss: qmss at 2a40000 {
 				qalloc-by-id;
 			};
 		};
+		accumulator {
+			acc-low-0 {
+				qrange = <480 32>;
+				accumulator = <0 47 16 2 50>;
+				interrupts = <0 226 0xf01>;
+				multi-queue;
+			};
+		};
 	};
+
 	descriptor-regions {
 		#address-cells = <1>;
 		#size-cells = <1>;
@@ -83,6 +92,21 @@ qmss: qmss at 2a40000 {
 			link-index = <0x4000>;
 		};
 	};
+
+	pdsps {
+		#address-cells = <1>;
+		#size-cells = <1>;
+		ranges;
+		pdsp0 at 0x2a10000 {
+			firmware = "ks2_qmss_pdsp_acc48_k2_le_1_0_0_9.bin";
+			reg = <0x2a10000 0x1000    /*iram */
+			       0x2a0f000 0x100     /*reg*/
+			       0x2a0c000 0x3c8	   /*intd */
+			       0x2a20000 0x4000>;  /*cmd*/
+			id = <0>;
+		};
+	};
+
 }; /* qmss */
 
 knav_dmas: knav_dmas at 0 {
-- 
1.9.1

[PATCH v1 1/2] soc: ti: display firmware file name as part of boot log

[santosh.shilimkar at oracle.com]

On 9/4/15 5:46 PM, Murali Karicheri wrote:
> To help the user, print the PDSP file name as part of
> knav_queue_load_pdsp(). This will be useful for users to know what
> version of the firmware is loaded to PDSP. Also update the
> document for the location of the QMSS accumulator PDSP firmware.
>
> Signed-off-by: Murali Karicheri <m-karicheri2@ti.com>
> ---

Looks fine. Will pick both the patches.

Regards,
Santosh

[PATCH v1 1/2] soc: ti: display firmware file name as part of boot log

[Murali Karicheri]

On 09/04/2015 11:53 PM, santosh.shilimkar at oracle.com wrote:
> On 9/4/15 5:46 PM, Murali Karicheri wrote:
>> To help the user, print the PDSP file name as part of
>> knav_queue_load_pdsp(). This will be useful for users to know what
>> version of the firmware is loaded to PDSP. Also update the
>> document for the location of the QMSS accumulator PDSP firmware.
>>
>> Signed-off-by: Murali Karicheri <m-karicheri2@ti.com>
>> ---
>
> Looks fine. Will pick both the patches.
>

Thanks Santhosh.

Is there a requirement to add the firmware to linux-firmware.git. Right 
now I have provided link to ti git repo that has the firmware. I have 
the patch ready in case this is required. Do you know?

Murali
> Regards,
> Santosh
>
>


-- 
Murali Karicheri
Linux Kernel, Keystone

[PATCH v1 1/2] soc: ti: display firmware file name as part of boot log

[santosh.shilimkar at oracle.com]

On 9/9/15 9:38 AM, Murali Karicheri wrote:
> On 09/04/2015 11:53 PM, santosh.shilimkar at oracle.com wrote:
>> On 9/4/15 5:46 PM, Murali Karicheri wrote:
>>> To help the user, print the PDSP file name as part of
>>> knav_queue_load_pdsp(). This will be useful for users to know what
>>> version of the firmware is loaded to PDSP. Also update the
>>> document for the location of the QMSS accumulator PDSP firmware.
>>>
>>> Signed-off-by: Murali Karicheri <m-karicheri2@ti.com>
>>> ---
>>
>> Looks fine. Will pick both the patches.
>>
>
> Thanks Santhosh.
>
> Is there a requirement to add the firmware to linux-firmware.git. Right
> now I have provided link to ti git repo that has the firmware. I have
> the patch ready in case this is required. Do you know?
>
Standard distro's will look for linux-firmware.git as a source to get
the firmware files used by kernel so yes, you should add these firmware
files to that repo.

Regards,
Santosh

[PATCH v1 1/2] soc: ti: display firmware file name as part of boot log

[Murali Karicheri]

On 09/09/2015 01:12 PM, santosh.shilimkar at oracle.com wrote:
> On 9/9/15 9:38 AM, Murali Karicheri wrote:
>> On 09/04/2015 11:53 PM, santosh.shilimkar at oracle.com wrote:
>>> On 9/4/15 5:46 PM, Murali Karicheri wrote:
>>>> To help the user, print the PDSP file name as part of
>>>> knav_queue_load_pdsp(). This will be useful for users to know what
>>>> version of the firmware is loaded to PDSP. Also update the
>>>> document for the location of the QMSS accumulator PDSP firmware.
>>>>
>>>> Signed-off-by: Murali Karicheri <m-karicheri2@ti.com>
>>>> ---
>>>
>>> Looks fine. Will pick both the patches.
>>>
>>
>> Thanks Santhosh.
>>
>> Is there a requirement to add the firmware to linux-firmware.git. Right
>> now I have provided link to ti git repo that has the firmware. I have
>> the patch ready in case this is required. Do you know?
>>
> Standard distro's will look for linux-firmware.git as a source to get
> the firmware files used by kernel so yes, you should add these firmware
> files to that repo.
Ok. Will send a patch for this.

Murali
>
> Regards,
> Santosh
>
>


-- 
Murali Karicheri
Linux Kernel, Keystone

[PATCH v1 1/2] soc: ti: display firmware file name as part of boot log

[Murali Karicheri]

On 09/09/2015 12:38 PM, Murali Karicheri wrote:
> On 09/04/2015 11:53 PM, santosh.shilimkar at oracle.com wrote:
>> On 9/4/15 5:46 PM, Murali Karicheri wrote:
>>> To help the user, print the PDSP file name as part of
>>> knav_queue_load_pdsp(). This will be useful for users to know what
>>> version of the firmware is loaded to PDSP. Also update the
>>> document for the location of the QMSS accumulator PDSP firmware.
>>>
>>> Signed-off-by: Murali Karicheri <m-karicheri2@ti.com>
>>> ---
>>
>> Looks fine. Will pick both the patches.
>>
>
> Thanks Santhosh.
>
> Is there a requirement to add the firmware to linux-firmware.git. Right
> now I have provided link to ti git repo that has the firmware. I have
> the patch ready in case this is required. Do you know?
>
> Murali
>> Regards,
>> Santosh
>>
>>
>
>
Santosh,

I have checked v4.3-rc1 and I don't see it. Did you send the pull request?

-- 
Murali Karicheri
Linux Kernel, Keystone

[PATCH v1 1/2] soc: ti: display firmware file name as part of boot log

[santosh shilimkar]

On 9/15/2015 11:14 AM, Murali Karicheri wrote:
> On 09/09/2015 12:38 PM, Murali Karicheri wrote:
>> On 09/04/2015 11:53 PM, santosh.shilimkar at oracle.com wrote:
>>> On 9/4/15 5:46 PM, Murali Karicheri wrote:
>>>> To help the user, print the PDSP file name as part of
>>>> knav_queue_load_pdsp(). This will be useful for users to know what
>>>> version of the firmware is loaded to PDSP. Also update the
>>>> document for the location of the QMSS accumulator PDSP firmware.
>>>>
>>>> Signed-off-by: Murali Karicheri <m-karicheri2@ti.com>
>>>> ---
>>>
>>> Looks fine. Will pick both the patches.
>>>
>>
>> Thanks Santhosh.
>>
>> Is there a requirement to add the firmware to linux-firmware.git. Right
>> now I have provided link to ti git repo that has the firmware. I have
>> the patch ready in case this is required. Do you know?
>>
>> Murali
>>> Regards,
>>> Santosh
>>>
>>>
>>
>>
> Santosh,
>
> I have checked v4.3-rc1 and I don't see it. Did you send the pull request?
>
They are in the queue fo 4.4-rc1. They were too late for 4.3.
You might know already, typically as a rule of thumb followed
on arm-soc, we need to get patches reviewed/acked by rc4 to make
it for next merge window.
Ofcourse genuine bug fixes can make it to the same cycle.

Regards,
Santosh

[PATCH v1 1/2] soc: ti: display firmware file name as part of boot log

[Murali Karicheri]

On 09/15/2015 05:20 PM, santosh shilimkar wrote:
> On 9/15/2015 11:14 AM, Murali Karicheri wrote:
>> On 09/09/2015 12:38 PM, Murali Karicheri wrote:
>>> On 09/04/2015 11:53 PM, santosh.shilimkar at oracle.com wrote:
>>>> On 9/4/15 5:46 PM, Murali Karicheri wrote:
>>>>> To help the user, print the PDSP file name as part of
>>>>> knav_queue_load_pdsp(). This will be useful for users to know what
>>>>> version of the firmware is loaded to PDSP. Also update the
>>>>> document for the location of the QMSS accumulator PDSP firmware.
>>>>>
>>>>> Signed-off-by: Murali Karicheri <m-karicheri2@ti.com>
>>>>> ---
>>>>
>>>> Looks fine. Will pick both the patches.
>>>>
>>>
>>> Thanks Santhosh.
>>>
>>> Is there a requirement to add the firmware to linux-firmware.git. Right
>>> now I have provided link to ti git repo that has the firmware. I have
>>> the patch ready in case this is required. Do you know?
>>>
>>> Murali
>>>> Regards,
>>>> Santosh
>>>>
>>>>
>>>
>>>
>> Santosh,
>>
>> I have checked v4.3-rc1 and I don't see it. Did you send the pull
>> request?
>>
> They are in the queue fo 4.4-rc1. They were too late for 4.3.
> You might know already, typically as a rule of thumb followed
> on arm-soc, we need to get patches reviewed/acked by rc4 to make
> it for next merge window.
> Ofcourse genuine bug fixes can make it to the same cycle.
Is there a branch where you have applied the patches that you can 
provide me? I want to send it to internal list for merge.

Murali
>
> Regards,
> Santosh
>
>


-- 
Murali Karicheri
Linux Kernel, Keystone

[PATCH v1 1/2] soc: ti: display firmware file name as part of boot log

[santosh shilimkar]

On 9/16/2015 10:01 AM, Murali Karicheri wrote:
> On 09/15/2015 05:20 PM, santosh shilimkar wrote:
>> On 9/15/2015 11:14 AM, Murali Karicheri wrote:
>>> On 09/09/2015 12:38 PM, Murali Karicheri wrote:

[..]
>>> Santosh,
>>>
>>> I have checked v4.3-rc1 and I don't see it. Did you send the pull
>>> request?
>>>
>> They are in the queue fo 4.4-rc1. They were too late for 4.3.
>> You might know already, typically as a rule of thumb followed
>> on arm-soc, we need to get patches reviewed/acked by rc4 to make
>> it for next merge window.
>> Ofcourse genuine bug fixes can make it to the same cycle.
> Is there a branch where you have applied the patches that you can
> provide me? I want to send it to internal list for merge.
>
Yes. I will push it out later this week. Will drop you
note when I do that.

[PATCH v1 1/2] soc: ti: display firmware file name as part of boot log

[santosh.shilimkar at oracle.com]

On 9/16/15 12:13 PM, santosh shilimkar wrote:
> On 9/16/2015 10:01 AM, Murali Karicheri wrote:
>> On 09/15/2015 05:20 PM, santosh shilimkar wrote:
>>> On 9/15/2015 11:14 AM, Murali Karicheri wrote:
>>>> On 09/09/2015 12:38 PM, Murali Karicheri wrote:
>
> [..]
>>>> Santosh,
>>>>
>>>> I have checked v4.3-rc1 and I don't see it. Did you send the pull
>>>> request?
>>>>
>>> They are in the queue fo 4.4-rc1. They were too late for 4.3.
>>> You might know already, typically as a rule of thumb followed
>>> on arm-soc, we need to get patches reviewed/acked by rc4 to make
>>> it for next merge window.
>>> Ofcourse genuine bug fixes can make it to the same cycle.
>> Is there a branch where you have applied the patches that you can
>> provide me? I want to send it to internal list for merge.
>>
> Yes. I will push it out later this week. Will drop you
> note when I do that.

Rebased version against v4.3-rc1 are available below. They
should also appear in linux-next soon.

git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git

for_4.4/dts
for_4.4/drivers-soc