diff for duplicates of <56DFFA9E.7060602@st.com> diff --git a/a/1.txt b/N1/1.txt index baf1e46..03bff03 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -31,3 +31,10 @@ Let me know if you agree. Regards Peppe +-------------- next part -------------- +A non-text attachment was scrubbed... +Name: normal_tmp.patch +Type: text/x-patch +Size: 950 bytes +Desc: not available +URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20160309/807d1599/attachment-0001.bin> diff --git a/a/2.hdr b/a/2.hdr deleted file mode 100644 index 6bb1742..0000000 --- a/a/2.hdr +++ /dev/null @@ -1,3 +0,0 @@ -Content-Type: text/x-patch; name="normal_tmp.patch" -Content-Transfer-Encoding: 7bit -Content-Disposition: attachment; filename="normal_tmp.patch" diff --git a/a/2.txt b/a/2.txt deleted file mode 100644 index 5ea62af..0000000 --- a/a/2.txt +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/drivers/net/ethernet/stmicro/stmmac/norm_desc.c b/drivers/net/ethernet/stmicro/stmmac/norm_desc.c -index e13228f..4392610 100644 ---- a/drivers/net/ethernet/stmicro/stmmac/norm_desc.c -+++ b/drivers/net/ethernet/stmicro/stmmac/norm_desc.c -@@ -210,7 +210,7 @@ static void ndesc_prepare_tx_desc(struct dma_desc *p, int is_fs, int len, - tdes1 &= ~TDES1_FIRST_SEGMENT; - - if (likely(csum_flag)) -- tdes1 |= (TX_CIC_FULL) << TDES1_CHECKSUM_INSERTION_SHIFT; -+ tdes1 |= (TX_CIC_FULL << TDES1_CHECKSUM_INSERTION_SHIFT); - else - tdes1 &= ~(TX_CIC_FULL << TDES1_CHECKSUM_INSERTION_SHIFT); - -@@ -220,6 +220,13 @@ static void ndesc_prepare_tx_desc(struct dma_desc *p, int is_fs, int len, - if (tx_own) - tdes1 |= TDES0_OWN; - -+ if (is_fs & tx_own) -+ /* When the own bit, for the first frame, has to be set, all -+ * descriptors for the same frame has to be set before, to -+ * avoid race condition. -+ */ -+ wmb(); -+ - p->des1 = tdes1; - } diff --git a/a/content_digest b/N1/content_digest index 4943d9a..c6315a7 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -16,23 +16,11 @@ "ref\056DFE64B.8060606@st.com\0" "ref\0CAAObsKBr9SXg1-wr9O-ypR8JozdGpeAwfDLMeUKi8ozxkKyTXg@mail.gmail.com\0" "ref\056DFF253.9050208@st.com\0" - "From\0Giuseppe CAVALLARO <peppe.cavallaro@st.com>\0" - "Subject\0Re: [PATCH v3 0/8] arm64: rockchip: Initial GeekBox enablement\0" + "From\0peppe.cavallaro@st.com (Giuseppe CAVALLARO)\0" + "Subject\0[PATCH v3 0/8] arm64: rockchip: Initial GeekBox enablement\0" "Date\0Wed, 9 Mar 2016 11:27:42 +0100\0" - "To\0Tomeu Vizoso <tomeu@tomeuvizoso.net>" - " Fabrice GASNIER <fabrice.gasnier@st.com>\0" - "Cc\0Dinh Nguyen <dinh.linux@gmail.com>" - devicetree@vger.kernel.org <devicetree@vger.kernel.org> - " Heiko St\303\274bner <heiko@sntech.de>" - netdev@vger.kernel.org - open list:ARM/Rockchip SoC... <linux-rockchip@lists.infradead.org> - LAKML <linux-arm-kernel@lists.infradead.org> - " Andreas F\303\244rber <afaerber@suse.de>" - Gabriel Fernandez <gabriel.fernandez@linaro.org> - Alexandre TORGUE <alexandre.torgue@st.com> - " Frank Sch\303\244fer <fschaefer.oss@googlemail.com>" - " LKML <linux-kernel@vger.kernel.org>\0" - "\01:1\0" + "To\0linux-arm-kernel@lists.infradead.org\0" + "\00:1\0" "b\0" "Hello Tomeu, Andreas,\n" "\n" @@ -66,35 +54,13 @@ "Let me know if you agree.\n" "\n" "Regards\n" - Peppe - "\01:2\0" - "fn\0normal_tmp.patch\0" - "b\0" - "diff --git a/drivers/net/ethernet/stmicro/stmmac/norm_desc.c b/drivers/net/ethernet/stmicro/stmmac/norm_desc.c\n" - "index e13228f..4392610 100644\n" - "--- a/drivers/net/ethernet/stmicro/stmmac/norm_desc.c\n" - "+++ b/drivers/net/ethernet/stmicro/stmmac/norm_desc.c\n" - "@@ -210,7 +210,7 @@ static void ndesc_prepare_tx_desc(struct dma_desc *p, int is_fs, int len,\n" - " \t\ttdes1 &= ~TDES1_FIRST_SEGMENT;\n" - " \n" - " \tif (likely(csum_flag))\n" - "-\t\ttdes1 |= (TX_CIC_FULL) << TDES1_CHECKSUM_INSERTION_SHIFT;\n" - "+\t\ttdes1 |= (TX_CIC_FULL << TDES1_CHECKSUM_INSERTION_SHIFT);\n" - " \telse\n" - " \t\ttdes1 &= ~(TX_CIC_FULL << TDES1_CHECKSUM_INSERTION_SHIFT);\n" - " \n" - "@@ -220,6 +220,13 @@ static void ndesc_prepare_tx_desc(struct dma_desc *p, int is_fs, int len,\n" - " \tif (tx_own)\n" - " \t\ttdes1 |= TDES0_OWN;\n" - " \n" - "+\tif (is_fs & tx_own)\n" - "+\t\t/* When the own bit, for the first frame, has to be set, all\n" - "+\t\t * descriptors for the same frame has to be set before, to\n" - "+\t\t * avoid race condition.\n" - "+\t\t */\n" - "+\t\twmb();\n" - "+\n" - " \tp->des1 = tdes1;\n" - } + "Peppe\n" + "-------------- next part --------------\n" + "A non-text attachment was scrubbed...\n" + "Name: normal_tmp.patch\n" + "Type: text/x-patch\n" + "Size: 950 bytes\n" + "Desc: not available\n" + URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20160309/807d1599/attachment-0001.bin> -0f5b3fa66e00b0262ee9986b93a749483e05e4fcdfd75f6cfec324319aa50dc1 +ba5209ae9530704f62c87d20d1b9aebd4064950a281b8f598523b8881e320c5b
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.