From 71665302adb59f0e7887dfa7fb0a936fc657ccad Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Thu, 18 Feb 2016 16:43:36 +0000 Subject: [PATCH 1/5] udeb: Make DAC960 and cciss optional in scsi-modules again They are only built on some architectures, but armhf and arm64 #include this file so currently FTBFS. --- debian/changelog | 7 +++++++ debian/installer/modules/scsi-modules | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index d479467ed..8ca5a5b59 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +linux (4.4.2-2) UNRELEASED; urgency=medium + + * udeb: Make DAC960 and cciss optional in scsi-modules again + (fixes FTBFS on armhf, arm64) + + -- Ben Hutchings Thu, 18 Feb 2016 16:43:30 +0000 + linux (4.4.2-1) unstable; urgency=medium * New upstream stable update: diff --git a/debian/installer/modules/scsi-modules b/debian/installer/modules/scsi-modules index 4a5a3dbc6..577914a10 100644 --- a/debian/installer/modules/scsi-modules +++ b/debian/installer/modules/scsi-modules @@ -1,7 +1,7 @@ # Include SCSI controller drivers by default drivers/scsi/** -DAC960 -cciss +DAC960 ? +cciss ? mptfc mptsas mptspi From c232b093cb2e3c1640c3f7ab3a5ff630963236ea Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Thu, 18 Feb 2016 16:45:54 +0000 Subject: [PATCH 2/5] [armel,armhf] net: mv643xx_eth: fix packet corruption with TSO and tiny unaligned packets. This looks like it fixes #814681. --- debian/changelog | 2 + ...fix-packet-corruption-with-tso-and-t.patch | 41 +++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 44 insertions(+) create mode 100644 debian/patches/bugfix/arm/net-mv643xx_eth-fix-packet-corruption-with-tso-and-t.patch diff --git a/debian/changelog b/debian/changelog index 8ca5a5b59..62894d163 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ linux (4.4.2-2) UNRELEASED; urgency=medium * udeb: Make DAC960 and cciss optional in scsi-modules again (fixes FTBFS on armhf, arm64) + * [armel,armhf] net: mv643xx_eth: fix packet corruption with TSO and tiny + unaligned packets. (Closes: #814681) -- Ben Hutchings Thu, 18 Feb 2016 16:43:30 +0000 diff --git a/debian/patches/bugfix/arm/net-mv643xx_eth-fix-packet-corruption-with-tso-and-t.patch b/debian/patches/bugfix/arm/net-mv643xx_eth-fix-packet-corruption-with-tso-and-t.patch new file mode 100644 index 000000000..5ccf75a12 --- /dev/null +++ b/debian/patches/bugfix/arm/net-mv643xx_eth-fix-packet-corruption-with-tso-and-t.patch @@ -0,0 +1,41 @@ +From: Nicolas Schichan +Date: Tue, 26 Jan 2016 16:12:35 +0100 +Subject: net: mv643xx_eth: fix packet corruption with TSO and tiny unaligned + packets. +Origin: https://git.kernel.org/linus/3b89624ab54b9dc2d92fc08ce2670e5f19ad8ec8 +Bug-Debian: https://bugs.debian.org/814681 + +The code in txq_put_data() would use txq->tx_curr_desc to index the +tso_hdrs/tso_hdrs_dma buffers, for less than 8 bytes unaligned +fragments, which is already moved to the next descriptor at the +beginning of the function. + +If that fragment was the last of the the skb, the next skb would use +that same space to place the ip headers, overwritting that small +fragment data. + +Fixes: 91986fd3d335 (net: mv643xx_eth: Ensure proper data alignment in TSO TX path) +Signed-off-by: Nicolas Schichan +Reviewed-by: Philipp Kirchhofer +Signed-off-by: David S. Miller +--- + drivers/net/ethernet/marvell/mv643xx_eth.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/net/ethernet/marvell/mv643xx_eth.c b/drivers/net/ethernet/marvell/mv643xx_eth.c +index a0c03834a2f7..55831188bc32 100644 +--- a/drivers/net/ethernet/marvell/mv643xx_eth.c ++++ b/drivers/net/ethernet/marvell/mv643xx_eth.c +@@ -762,10 +762,10 @@ txq_put_data_tso(struct net_device *dev, struct tx_queue *txq, + + if (length <= 8 && (uintptr_t)data & 0x7) { + /* Copy unaligned small data fragment to TSO header data area */ +- memcpy(txq->tso_hdrs + txq->tx_curr_desc * TSO_HEADER_SIZE, ++ memcpy(txq->tso_hdrs + tx_index * TSO_HEADER_SIZE, + data, length); + desc->buf_ptr = txq->tso_hdrs_dma +- + txq->tx_curr_desc * TSO_HEADER_SIZE; ++ + tx_index * TSO_HEADER_SIZE; + } else { + /* Alignment is okay, map buffer and hand off to hardware */ + txq->tx_desc_mapping[tx_index] = DESC_DMA_MAP_SINGLE; diff --git a/debian/patches/series b/debian/patches/series index 6d47798f4..ec1bad367 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -129,3 +129,4 @@ bugfix/x86/x86-efi-setup-separate-efi-page-tables-in-kexec-path.patch bugfix/x86/x86-mm-fix-types-used-in-pgprot-cacheability-flags-t.patch debian/i386-686-pae-pci-set-pci-nobios-by-default.patch bugfix/all/iff_no_queue-fix-for-drivers-not-calling-ether_setup.patch +bugfix/arm/net-mv643xx_eth-fix-packet-corruption-with-tso-and-t.patch From a776630eb7175201359a0a0683c4378dc0b278e1 Mon Sep 17 00:00:00 2001 From: Martin Michlmayr Date: Thu, 18 Feb 2016 18:22:43 -0800 Subject: [PATCH 3/5] [arm64] Create i2c-modules udeb to avoid duplicate modules Create i2c-modules udeb on arm64 to avoid the following build failure: kernel-wedge find-dups 4.4.0-1-arm64 debian/nic-modules-4.4.0-1-arm64-di lib/modules/4.4.0-1-arm64/kernel/drivers/i2c/i2c-core.ko debian/input-modules-4.4.0-1-arm64-di lib/modules/4.4.0-1-arm64/kernel/drivers/i2c/i2c-core.ko some modules are in more than one package command exited with status 1 --- debian/changelog | 4 ++++ debian/installer/arm64/modules/arm64/i2c-modules | 1 + 2 files changed, 5 insertions(+) create mode 100644 debian/installer/arm64/modules/arm64/i2c-modules diff --git a/debian/changelog b/debian/changelog index 62894d163..d8cb71a4f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,14 @@ linux (4.4.2-2) UNRELEASED; urgency=medium + [ Ben Hutchings ] * udeb: Make DAC960 and cciss optional in scsi-modules again (fixes FTBFS on armhf, arm64) * [armel,armhf] net: mv643xx_eth: fix packet corruption with TSO and tiny unaligned packets. (Closes: #814681) + [ Martin Michlmayr ] + * [arm64] Create i2c-modules udeb to avoid duplicate modules. + -- Ben Hutchings Thu, 18 Feb 2016 16:43:30 +0000 linux (4.4.2-1) unstable; urgency=medium diff --git a/debian/installer/arm64/modules/arm64/i2c-modules b/debian/installer/arm64/modules/arm64/i2c-modules new file mode 100644 index 000000000..203a607e7 --- /dev/null +++ b/debian/installer/arm64/modules/arm64/i2c-modules @@ -0,0 +1 @@ +#include From e6ce1b131d07a387ef158b733dcd90c86e3a04a2 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Fri, 19 Feb 2016 14:42:26 +0000 Subject: [PATCH 4/5] [mipsel/loongson-2f] udeb: Add i2c-modules to avoid duplicate modules Also add "Provides: i2c-modules" to kernel-image udeb for loongson-2e. --- debian/changelog | 1 + debian/installer/mipsel/modules/mipsel-loongson-2f/i2c-modules | 1 + debian/installer/mipsel/package-list | 1 + 3 files changed, 3 insertions(+) create mode 100644 debian/installer/mipsel/modules/mipsel-loongson-2f/i2c-modules diff --git a/debian/changelog b/debian/changelog index d8cb71a4f..ed43cbe5b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ linux (4.4.2-2) UNRELEASED; urgency=medium (fixes FTBFS on armhf, arm64) * [armel,armhf] net: mv643xx_eth: fix packet corruption with TSO and tiny unaligned packets. (Closes: #814681) + * [mipsel/loongson-2f] udeb: Add i2c-modules to avoid duplicate modules [ Martin Michlmayr ] * [arm64] Create i2c-modules udeb to avoid duplicate modules. diff --git a/debian/installer/mipsel/modules/mipsel-loongson-2f/i2c-modules b/debian/installer/mipsel/modules/mipsel-loongson-2f/i2c-modules new file mode 100644 index 000000000..203a607e7 --- /dev/null +++ b/debian/installer/mipsel/modules/mipsel-loongson-2f/i2c-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/mipsel/package-list b/debian/installer/mipsel/package-list index 621363abe..c61e68ad5 100644 --- a/debian/installer/mipsel/package-list +++ b/debian/installer/mipsel/package-list @@ -5,4 +5,5 @@ # Package: kernel-image Provides: rtc-modules +Provides_loongson-2e: i2c-modules, rtc-modules Provides_loongson-3: i2c-modules, rtc-modules From d2c5c9e085e9e1c201d542f5ff7c2f413fbcbe18 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Fri, 19 Feb 2016 14:48:52 +0000 Subject: [PATCH 5/5] Prepare to release linux (4.4.2-2). --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index ed43cbe5b..9628e6f97 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -linux (4.4.2-2) UNRELEASED; urgency=medium +linux (4.4.2-2) unstable; urgency=medium [ Ben Hutchings ] * udeb: Make DAC960 and cciss optional in scsi-modules again @@ -10,7 +10,7 @@ linux (4.4.2-2) UNRELEASED; urgency=medium [ Martin Michlmayr ] * [arm64] Create i2c-modules udeb to avoid duplicate modules. - -- Ben Hutchings Thu, 18 Feb 2016 16:43:30 +0000 + -- Ben Hutchings Fri, 19 Feb 2016 14:48:52 +0000 linux (4.4.2-1) unstable; urgency=medium