| Message ID | 9ed025d4e98f716ba80b27acaaa98f43ad3bd75a.1383047327.git.b42378@freescale.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, Oct 29, 2013 at 08:33:15PM +0800, Nicolin Chen wrote: > There's a script for SSI missing in current sdma script list. Thus add it. > This script would allow SSI use its dual fifo mode to transimit/receive > data without occasional hardware underrun/overrun. > > This patch also fixed a counting error for total number of scripts. Look at drivers/dma/imx-sdma.c: > /** > * struct sdma_firmware_header - Layout of the firmware image > * > * @magic "SDMA" > * @version_major increased whenever layout of struct > * sdma_script_start_addrs > * changes. Can you image why this firmware has a version field? Right, it's because it encodes the layout of struct sdma_script_start_addrs. As the comment clearly states you have to *increase this field* when you add scripts. Obviously you missed that, as the firmware on lkml posted recently shows: > 00000000: 414d4453 00000001 00000001 0000001c SDMA............ ^^^^^^^^ Still '1' > 00000010: 00000026 000000b4 0000067a 00000282 &.......z....... > 00000020: ffffffff 00000000 ffffffff ffffffff ................ > 00000030: ffffffff ffffffff ffffffff ffffffff ................ > 00000040: ffffffff ffffffff 00001a6a ffffffff ........j....... > 00000050: 000002eb 000018bb ffffffff 00000408 ................ > 00000060: ffffffff 000003c0 ffffffff ffffffff ................ > 00000070: ffffffff 000002ab ffffffff 0000037b ............{... > 00000080: ffffffff ffffffff 0000044c 0000046e ........L...n... > 00000090: ffffffff 00001800 ffffffff ffffffff ................ > 000000a0: 00000000 00001800 00001862 00001a16 ........b....... ^^^^^^^^^^^^^^^^^ new script addresses introduced > -#define SDMA_SCRIPT_ADDRS_ARRAY_SIZE_V1 34 > +#define SDMA_SCRIPT_ADDRS_ARRAY_SIZE_V1 37 And no, this is not a bug. It's your firmware header that is buggy. What you need is: #define SDMA_SCRIPT_ADDRS_ARRAY_SIZE_V2 37 You (you as a company, not you as a person) knew that it was me who created this firmware format. So it was absolutely unnecessary to create an incompatible firmware instead of dropping me a short note. Please add a version check to the driver as necessary and provide a proper firmware. Sascha
On Oct 29, 2013, at 7:33 AM, Nicolin Chen wrote: > There's a script for SSI missing in current sdma script list. Thus add it. > This script would allow SSI use its dual fifo mode to transimit/receive > data without occasional hardware underrun/overrun. > > This patch also fixed a counting error for total number of scripts. > > Signed-off-by: Nicolin Chen <b42378@freescale.com> > --- > Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt | 1 + > drivers/dma/imx-sdma.c | 6 +++++- > include/linux/platform_data/dma-imx-sdma.h | 2 ++ > include/linux/platform_data/dma-imx.h | 1 + > 4 files changed, 9 insertions(+), 1 deletion(-) > > diff --git a/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt b/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt > index 4fa814d..3b933c5 100644 > --- a/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt > +++ b/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt > @@ -42,6 +42,7 @@ The full ID of peripheral types can be found below. > 19 IPU Memory > 20 ASRC > 21 ESAI > + 22 SSI Dual FIFO > > The third cell specifies the transfer priority as below. For the DT-Binding portion: Acked-by: Kumar Gala <galak@codeaurora.org> - k
Hi Sascha, On Tue, Oct 29, 2013 at 02:51:43PM +0100, Sascha Hauer wrote: > Look at drivers/dma/imx-sdma.c: > > > /** > > * struct sdma_firmware_header - Layout of the firmware image > > * > > * @magic "SDMA" > > * @version_major increased whenever layout of struct > > * sdma_script_start_addrs > > * changes. > > Can you image why this firmware has a version field? Right, it's because > it encodes the layout of struct sdma_script_start_addrs. > > As the comment clearly states you have to *increase this field* when you > add scripts. > > Obviously you missed that, as the firmware on lkml posted recently > shows: > > > 00000000: 414d4453 00000001 00000001 0000001c SDMA............ > ^^^^^^^^ > Still '1' > > > 00000010: 00000026 000000b4 0000067a 00000282 &.......z....... > > 00000020: ffffffff 00000000 ffffffff ffffffff ................ > > 00000030: ffffffff ffffffff ffffffff ffffffff ................ > > 00000040: ffffffff ffffffff 00001a6a ffffffff ........j....... > > 00000050: 000002eb 000018bb ffffffff 00000408 ................ > > 00000060: ffffffff 000003c0 ffffffff ffffffff ................ > > 00000070: ffffffff 000002ab ffffffff 0000037b ............{... > > 00000080: ffffffff ffffffff 0000044c 0000046e ........L...n... > > 00000090: ffffffff 00001800 ffffffff ffffffff ................ > > 000000a0: 00000000 00001800 00001862 00001a16 ........b....... > ^^^^^^^^^^^^^^^^^ > new script addresses introduced > > > > -#define SDMA_SCRIPT_ADDRS_ARRAY_SIZE_V1 34 > > +#define SDMA_SCRIPT_ADDRS_ARRAY_SIZE_V1 37 > > And no, this is not a bug. It's your firmware header that is buggy. > I wasn't aware that the problem is far more complicated than I thought. And thank you for telling me all this. > What you need is: > > #define SDMA_SCRIPT_ADDRS_ARRAY_SIZE_V2 37 > > You (you as a company, not you as a person) knew that it was me who > created this firmware format. So it was absolutely unnecessary to create > an incompatible firmware instead of dropping me a short note. > > Please add a version check to the driver as necessary and provide a proper > firmware. > Just currently it's not easy for me to create a new proper firmware, and I's been told that besides this version number, it also lacks a decent license info. So may I just refine this patch as you suggested to add a version check and add those new scripts first? Thank you, Nicolin Chen > Sascha > > -- > Pengutronix e.K. | | > Industrial Linux Solutions | http://www.pengutronix.de/ | > Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | > Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | >
diff --git a/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt b/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt index 4fa814d..3b933c5 100644 --- a/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt +++ b/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt @@ -42,6 +42,7 @@ The full ID of peripheral types can be found below. 19 IPU Memory 20 ASRC 21 ESAI + 22 SSI Dual FIFO The third cell specifies the transfer priority as below. diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c index fc43603..695871f 100644 --- a/drivers/dma/imx-sdma.c +++ b/drivers/dma/imx-sdma.c @@ -724,6 +724,10 @@ static void sdma_get_pc(struct sdma_channel *sdmac, per_2_emi = sdma->script_addrs->app_2_mcu_addr; emi_2_per = sdma->script_addrs->mcu_2_app_addr; break; + case IMX_DMATYPE_SSI_DUAL: + per_2_emi = sdma->script_addrs->ssish_2_mcu_addr; + emi_2_per = sdma->script_addrs->mcu_2_ssish_addr; + break; case IMX_DMATYPE_SSI_SP: case IMX_DMATYPE_MMC: case IMX_DMATYPE_SDHC: @@ -1237,7 +1241,7 @@ static void sdma_issue_pending(struct dma_chan *chan) sdma_enable_channel(sdma, sdmac->channel); } -#define SDMA_SCRIPT_ADDRS_ARRAY_SIZE_V1 34 +#define SDMA_SCRIPT_ADDRS_ARRAY_SIZE_V1 37 static void sdma_add_scripts(struct sdma_engine *sdma, const struct sdma_script_start_addrs *addr) diff --git a/include/linux/platform_data/dma-imx-sdma.h b/include/linux/platform_data/dma-imx-sdma.h index 3a39428..19cfa9a 100644 --- a/include/linux/platform_data/dma-imx-sdma.h +++ b/include/linux/platform_data/dma-imx-sdma.h @@ -43,6 +43,8 @@ struct sdma_script_start_addrs { s32 dptc_dvfs_addr; s32 utra_addr; s32 ram_code_start_addr; + s32 mcu_2_ssish_addr; + s32 ssish_2_mcu_addr; }; /** diff --git a/include/linux/platform_data/dma-imx.h b/include/linux/platform_data/dma-imx.h index beac6b8..bcbc6c3 100644 --- a/include/linux/platform_data/dma-imx.h +++ b/include/linux/platform_data/dma-imx.h @@ -39,6 +39,7 @@ enum sdma_peripheral_type { IMX_DMATYPE_IPU_MEMORY, /* IPU Memory */ IMX_DMATYPE_ASRC, /* ASRC */ IMX_DMATYPE_ESAI, /* ESAI */ + IMX_DMATYPE_SSI_DUAL, /* SSI Dual FIFO */ }; enum imx_dma_prio {
There's a script for SSI missing in current sdma script list. Thus add it. This script would allow SSI use its dual fifo mode to transimit/receive data without occasional hardware underrun/overrun. This patch also fixed a counting error for total number of scripts. Signed-off-by: Nicolin Chen <b42378@freescale.com> --- Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt | 1 + drivers/dma/imx-sdma.c | 6 +++++- include/linux/platform_data/dma-imx-sdma.h | 2 ++ include/linux/platform_data/dma-imx.h | 1 + 4 files changed, 9 insertions(+), 1 deletion(-)