From 119777766219649e04363c8b22d4936252dcdd47 Mon Sep 17 00:00:00 2001 From: Andreas Monzner Date: Fri, 23 Oct 2015 15:40:35 +0200 Subject: [PATCH] linux-dreambox-3.4: update to 3.4.110 --- ...-ext2-ext3-support-because-we-have-s.patch | 62 --------- .../backport_bcmgenet_fix_from_3.3-3.6.patch | 120 ------------------ .../linux/linux-dreambox_3.4.bb | 14 +- 3 files changed, 6 insertions(+), 190 deletions(-) delete mode 100644 meta-dreambox/recipes-kernel/linux/linux-dreambox-3.4/0001-re-enable-native-ext2-ext3-support-because-we-have-s.patch delete mode 100644 meta-dreambox/recipes-kernel/linux/linux-dreambox-3.4/backport_bcmgenet_fix_from_3.3-3.6.patch diff --git a/meta-dreambox/recipes-kernel/linux/linux-dreambox-3.4/0001-re-enable-native-ext2-ext3-support-because-we-have-s.patch b/meta-dreambox/recipes-kernel/linux/linux-dreambox-3.4/0001-re-enable-native-ext2-ext3-support-because-we-have-s.patch deleted file mode 100644 index d01cfc25..00000000 --- a/meta-dreambox/recipes-kernel/linux/linux-dreambox-3.4/0001-re-enable-native-ext2-ext3-support-because-we-have-s.patch +++ /dev/null @@ -1,62 +0,0 @@ -From f1ca71eca804fb12d9512c1e7e64d9ea0138fc9d Mon Sep 17 00:00:00 2001 -From: Andreas Monzner -Date: Wed, 2 Sep 2015 14:36:15 +0200 -Subject: [PATCH] re-enable native ext2/ext3 support because we have sometimes - strange recording problems with ext3 filesystems mounted by ext4 driver - ---- - arch/mips/configs/dm7080_defconfig | 10 +++++++--- - arch/mips/configs/dm820_defconfig | 10 +++++++--- - 2 files changed, 14 insertions(+), 6 deletions(-) - -diff --git a/arch/mips/configs/dm7080_defconfig b/arch/mips/configs/dm7080_defconfig -index e5abcce..28ceea1 100644 ---- a/arch/mips/configs/dm7080_defconfig -+++ b/arch/mips/configs/dm7080_defconfig -@@ -2775,12 +2775,16 @@ CONFIG_IOMMU_SUPPORT=y - # - # File systems - # --# CONFIG_EXT2_FS is not set --# CONFIG_EXT3_FS is not set -+CONFIG_EXT2_FS=y -+# CONFIG_EXT2_FS_XATTR is not set -+# CONFIG_EXT2_FS_XIP is not set -+CONFIG_EXT3_FS=y -+CONFIG_EXT3_DEFAULTS_TO_ORDERED=y -+# CONFIG_EXT3_FS_XATTR is not set - CONFIG_EXT4_FS=y --CONFIG_EXT4_USE_FOR_EXT23=y - # CONFIG_EXT4_FS_XATTR is not set - # CONFIG_EXT4_DEBUG is not set -+CONFIG_JBD=y - CONFIG_JBD2=y - CONFIG_REISERFS_FS=m - # CONFIG_REISERFS_CHECK is not set -diff --git a/arch/mips/configs/dm820_defconfig b/arch/mips/configs/dm820_defconfig -index f8876e3..3ae20fa 100644 ---- a/arch/mips/configs/dm820_defconfig -+++ b/arch/mips/configs/dm820_defconfig -@@ -2775,12 +2775,16 @@ CONFIG_IOMMU_SUPPORT=y - # - # File systems - # --# CONFIG_EXT2_FS is not set --# CONFIG_EXT3_FS is not set -+CONFIG_EXT2_FS=y -+# CONFIG_EXT2_FS_XATTR is not set -+# CONFIG_EXT2_FS_XIP is not set -+CONFIG_EXT3_FS=y -+CONFIG_EXT3_DEFAULTS_TO_ORDERED=y -+# CONFIG_EXT3_FS_XATTR is not set - CONFIG_EXT4_FS=y --CONFIG_EXT4_USE_FOR_EXT23=y - # CONFIG_EXT4_FS_XATTR is not set - # CONFIG_EXT4_DEBUG is not set -+CONFIG_JBD=y - CONFIG_JBD2=y - CONFIG_REISERFS_FS=m - # CONFIG_REISERFS_CHECK is not set --- -1.9.1 - diff --git a/meta-dreambox/recipes-kernel/linux/linux-dreambox-3.4/backport_bcmgenet_fix_from_3.3-3.6.patch b/meta-dreambox/recipes-kernel/linux/linux-dreambox-3.4/backport_bcmgenet_fix_from_3.3-3.6.patch deleted file mode 100644 index a5b660a8..00000000 --- a/meta-dreambox/recipes-kernel/linux/linux-dreambox-3.4/backport_bcmgenet_fix_from_3.3-3.6.patch +++ /dev/null @@ -1,120 +0,0 @@ -diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c -index 754c39a..97fad5a 100644 ---- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c -+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c -@@ -619,6 +619,40 @@ err2: - - return -ENODEV; - } -+ -+static void bcmgenet_free_rx_buffers(struct BcmEnet_devctrl *pDevCtrl) -+{ -+ struct Enet_CB *cb; -+ unsigned int i; -+ unsigned int freed = 0; -+ -+ for (i = 0; i < pDevCtrl->nrRxBds; i++) { -+ cb = &pDevCtrl->rxCbs[i]; -+ -+ if (dma_unmap_addr(cb, dma_addr)) { -+ dma_unmap_single(&pDevCtrl->dev->dev, -+ dma_unmap_addr(cb, dma_addr), -+ pDevCtrl->rxBufLen, DMA_FROM_DEVICE); -+ dma_unmap_addr_set(cb, dma_addr, 0); -+ } -+ -+ if (cb->skb) { -+ freed++; -+ dev_kfree_skb(pDevCtrl->rxCbs[i].skb); -+ cb->skb = NULL; -+ } -+ -+ /* Reset the address to 0, such that next calls to assign_rx_buffers -+ * re-allocate buffers -+ */ -+ pDevCtrl->rxBds[i].address = 0; -+ } -+ -+ pDevCtrl->rxBdAssignPtr = pDevCtrl->rxBds; -+ -+ TRACE(("%s: freed: %d SKBs\n", __func__, freed)); -+} -+ - /* -------------------------------------------------------------------------- - Name: bcmgenet_close - Purpose: Stop communicating with the outside world -@@ -690,6 +724,8 @@ static int bcmgenet_close(struct net_device *dev) - - if (brcm_pm_deep_sleep()) - save_state(pDevCtrl); -+ else -+ bcmgenet_free_rx_buffers(pDevCtrl); - - if (device_may_wakeup(&dev->dev) && pDevCtrl->dev_asleep) { - if (pDevCtrl->wolopts & (WAKE_MAGIC|WAKE_MAGICSECURE)) -@@ -1936,6 +1972,7 @@ static irqreturn_t bcmgenet_isr1(int irq, void *dev_id) - struct BcmEnet_devctrl *pDevCtrl = dev_id; - volatile struct intrl2Regs *intrl2 = pDevCtrl->intrl2_1; - unsigned int index; -+ unsigned long flags; - - /* Save irq status for bottom-half processing. */ - pDevCtrl->irq1_stat = intrl2->cpu_stat & ~intrl2->cpu_mask_status; -@@ -1950,8 +1987,11 @@ static irqreturn_t bcmgenet_isr1(int irq, void *dev_id) - if (pDevCtrl->irq1_stat & 0x0000ffff) { - index = 0; - for (index = 0; index < 16; index++) { -- if (pDevCtrl->irq1_stat & (1<irq1_stat & (1<lock, flags); - bcmgenet_tx_reclaim(pDevCtrl->dev, index); -+ spin_unlock_irqrestore(&pDevCtrl->lock, flags); -+ } - } - } - -@@ -2215,7 +2255,6 @@ static int assign_rx_buffers(struct BcmEnet_devctrl *pDevCtrl) - handleAlignment(pDevCtrl, skb); - - /* keep count of any BD's we refill */ -- bdsfilled++; - cb->skb = skb; - mapping = dma_map_single(&pDevCtrl->dev->dev, - skb->data, pDevCtrl->rxBufLen, DMA_FROM_DEVICE); -@@ -2236,6 +2275,7 @@ static int assign_rx_buffers(struct BcmEnet_devctrl *pDevCtrl) - else - pDevCtrl->rxBdAssignPtr++; - -+ bdsfilled++; - } - - /* Enable rx DMA incase it was disabled due to running out of rx BD */ -@@ -2811,13 +2851,6 @@ static int bcmgenet_init_dev(struct BcmEnet_devctrl *pDevCtrl, bool reset) - lastBd = pDevCtrl->txBds + pDevCtrl->nrTxBds - 1; - pDevCtrl->txFreeBds = pDevCtrl->nrTxBds; - -- /* fill receive buffers */ -- if (assign_rx_buffers(pDevCtrl) == 0) { -- printk(KERN_ERR "Failed to assign rx buffers\n"); -- ret = -ENOMEM; -- goto error1; -- } -- - TRACE(("%s done!\n", __func__)); - /* init umac registers */ - if (init_umac(pDevCtrl, reset)) { -@@ -2861,12 +2894,8 @@ static void bcmgenet_uninit_dev(struct BcmEnet_devctrl *pDevCtrl) - pDevCtrl->txCbs[i].skb = NULL; - } - } -- for (i = 0; i < pDevCtrl->nrRxBds; i++) { -- if (pDevCtrl->rxCbs[i].skb != NULL) { -- dev_kfree_skb(pDevCtrl->rxCbs[i].skb); -- pDevCtrl->rxCbs[i].skb = NULL; -- } -- } -+ -+ bcmgenet_free_rx_buffers(pDevCtrl); - - /* free the transmit buffer descriptor */ - if (pDevCtrl->txBds) diff --git a/meta-dreambox/recipes-kernel/linux/linux-dreambox_3.4.bb b/meta-dreambox/recipes-kernel/linux/linux-dreambox_3.4.bb index bbc5aa9e..20aba139 100644 --- a/meta-dreambox/recipes-kernel/linux/linux-dreambox_3.4.bb +++ b/meta-dreambox/recipes-kernel/linux/linux-dreambox_3.4.bb @@ -1,20 +1,18 @@ -PATCHREV = "38c24319e8b82eeab5d102eba355718ae8f50c48" -PATCHLEVEL = "106" +PATCHREV = "a904cb737a1d95034adc4717200cdf1e52ec8549" +PATCHLEVEL = "110" SRC_URI = " \ ${KERNELORG_MIRROR}/linux/kernel/v3.x/linux-3.4.tar.xz;name=kernel \ ${KERNELORG_MIRROR}/linux/kernel/v3.x/patch-3.4.${PATCHLEVEL}.xz;apply=yes;name=stable-patch \ http://dreamboxupdate.com/download/kernel-patches/linux-dreambox-${PV}-${PATCHREV}.patch.xz;apply=yes;name=dream-patch \ - file://backport_bcmgenet_fix_from_3.3-3.6.patch \ - file://0001-re-enable-native-ext2-ext3-support-because-we-have-s.patch \ " SRC_URI[kernel.md5sum] = "967f72983655e2479f951195953e8480" SRC_URI[kernel.sha256sum] = "ff3dee6a855873d12487a6f4070ec2f7996d073019171361c955639664baa0c6" -SRC_URI[stable-patch.md5sum] = "fee956dfe6e1bb4bd0224ceb16338d9b" -SRC_URI[stable-patch.sha256sum] = "eeeeb599392391a8117b8c7d6fdc85153038d1d43e4b9582620b4c62e061e21d" -SRC_URI[dream-patch.md5sum] = "bdca5598db039833c4badf61db3a303f" -SRC_URI[dream-patch.sha256sum] = "1eae07fc11f027d6363abe0d88d0ef7ba5def5e548fc1ddb58d4908af9702a03" +SRC_URI[stable-patch.md5sum] = "4225d2f3a2bdd2d2fed94b5b83a5a8bb" +SRC_URI[stable-patch.sha256sum] = "132362637b7ba272d58acbedb172a7233c238ec1d794af111af55ee8a406e12d" +SRC_URI[dream-patch.md5sum] = "81d8689bc16214cd1737e029d39bb46c" +SRC_URI[dream-patch.sha256sum] = "4e4d40bc4ea6d1425348c6a01aad637686da835378ef78896e89686c38884d44" S = "${WORKDIR}/linux-3.4" -- 2.20.1