Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
39 changed files
with
652 additions
and
316 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
56 changes: 0 additions & 56 deletions
56
linux-bfq/0004-disabling-primary-plane-in-the-noatomic-case.patch
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| index 2cadf08..b48565e 100644 | ||
| --- a/drivers/mmc/host/sdhci.c | ||
| +++ b/drivers/mmc/host/sdhci.c | ||
| @@ -1895,9 +1895,9 @@ static int sdhci_execute_tuning(struct mmc_host *mmc, u32 opcode) | ||
| tuning_count = host->tuning_count; | ||
|
|
||
| /* | ||
| - * The Host Controller needs tuning only in case of SDR104 mode | ||
| - * and for SDR50 mode when Use Tuning for SDR50 is set in the | ||
| - * Capabilities register. | ||
| + * The Host Controller needs tuning in case of SDR104 and DDR50 | ||
| + * mode, and for SDR50 mode when Use Tuning for SDR50 is set in | ||
| + * the Capabilities register. | ||
| * If the Host Controller supports the HS200 mode then the | ||
| * tuning function has to be executed. | ||
| */ | ||
| @@ -1917,6 +1917,7 @@ static int sdhci_execute_tuning(struct mmc_host *mmc, u32 opcode) | ||
| break; | ||
|
|
||
| case MMC_TIMING_UHS_SDR104: | ||
| + case MMC_TIMING_UHS_DDR50: | ||
| break; | ||
|
|
||
| case MMC_TIMING_UHS_SDR50: | ||
| generated by cgit v0.11.2 at 2016-01-01 22:11:38 (GMT) |
24 changes: 24 additions & 0 deletions
24
...fq/0006-tpmdd-devel-v3-base-platform-fix-binding-for-drivers-without-probe-callback.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| diff --git a/drivers/base/platform.c b/drivers/base/platform.c | ||
| index 1dd6d3b..176b59f 100644 | ||
| --- a/drivers/base/platform.c | ||
| +++ b/drivers/base/platform.c | ||
| @@ -513,10 +513,15 @@ static int platform_drv_probe(struct device *_dev) | ||
| return ret; | ||
|
|
||
| ret = dev_pm_domain_attach(_dev, true); | ||
| - if (ret != -EPROBE_DEFER && drv->probe) { | ||
| - ret = drv->probe(dev); | ||
| - if (ret) | ||
| - dev_pm_domain_detach(_dev, true); | ||
| + if (ret != -EPROBE_DEFER) { | ||
| + if (drv->probe) { | ||
| + ret = drv->probe(dev); | ||
| + if (ret) | ||
| + dev_pm_domain_detach(_dev, true); | ||
| + } else { | ||
| + /* don't fail if just dev_pm_domain_attach failed */ | ||
| + ret = 0; | ||
| + } | ||
| } | ||
|
|
||
| if (drv->prevent_deferred_probe && ret == -EPROBE_DEFER) { |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,78 @@ | ||
| From 80ad623edd2d0ccb47d85357ee31c97e6c684e82 Mon Sep 17 00:00:00 2001 | ||
| From: David Sterba <dsterba@suse.com> | ||
| Date: Mon, 25 Jan 2016 11:02:06 +0100 | ||
| Subject: Revert "btrfs: clear PF_NOFREEZE in cleaner_kthread()" | ||
|
|
||
| This reverts commit 696249132158014d594896df3a81390616069c5c. The | ||
| cleaner thread can block freezing when there's a snapshot cleaning in | ||
| progress and the other threads get suspended first. From the logs | ||
| provided by Martin we're waiting for reading extent pages: | ||
|
|
||
| kernel: PM: Syncing filesystems ... done. | ||
| kernel: Freezing user space processes ... (elapsed 0.015 seconds) done. | ||
| kernel: Freezing remaining freezable tasks ... | ||
| kernel: Freezing of tasks failed after 20.003 seconds (1 tasks refusing to freeze, wq_busy=0): | ||
| kernel: btrfs-cleaner D ffff88033dd13bc0 0 152 2 0x00000000 | ||
| kernel: ffff88032ebc2e00 ffff88032e750000 ffff88032e74fa50 7fffffffffffffff | ||
| kernel: ffffffff814a58df 0000000000000002 ffffea000934d580 ffffffff814a5451 | ||
| kernel: 7fffffffffffffff ffffffff814a6e8f 0000000000000000 0000000000000020 | ||
| kernel: Call Trace: | ||
| kernel: [<ffffffff814a58df>] ? bit_wait+0x2c/0x2c | ||
| kernel: [<ffffffff814a5451>] ? schedule+0x6f/0x7c | ||
| kernel: [<ffffffff814a6e8f>] ? schedule_timeout+0x2f/0xd8 | ||
| kernel: [<ffffffff81076f94>] ? timekeeping_get_ns+0xa/0x2e | ||
| kernel: [<ffffffff81077603>] ? ktime_get+0x36/0x44 | ||
| kernel: [<ffffffff814a4f6c>] ? io_schedule_timeout+0x94/0xf2 | ||
| kernel: [<ffffffff814a4f6c>] ? io_schedule_timeout+0x94/0xf2 | ||
| kernel: [<ffffffff814a590b>] ? bit_wait_io+0x2c/0x30 | ||
| kernel: [<ffffffff814a5694>] ? __wait_on_bit+0x41/0x73 | ||
| kernel: [<ffffffff8109eba8>] ? wait_on_page_bit+0x6d/0x72 | ||
| kernel: [<ffffffff8105d718>] ? autoremove_wake_function+0x2a/0x2a | ||
| kernel: [<ffffffff811a02d7>] ? read_extent_buffer_pages+0x1bd/0x203 | ||
| kernel: [<ffffffff8117d9e9>] ? free_root_pointers+0x4c/0x4c | ||
| kernel: [<ffffffff8117e831>] ? btree_read_extent_buffer_pages.constprop.57+0x5a/0xe9 | ||
| kernel: [<ffffffff8117f4f3>] ? read_tree_block+0x2d/0x45 | ||
| kernel: [<ffffffff8116782a>] ? read_block_for_search.isra.34+0x22a/0x26b | ||
| kernel: [<ffffffff811656c3>] ? btrfs_set_path_blocking+0x1e/0x4a | ||
| kernel: [<ffffffff8116919b>] ? btrfs_search_slot+0x648/0x736 | ||
| kernel: [<ffffffff81170559>] ? btrfs_lookup_extent_info+0xb7/0x2c7 | ||
| kernel: [<ffffffff81170ee5>] ? walk_down_proc+0x9c/0x1ae | ||
| kernel: [<ffffffff81171c9d>] ? walk_down_tree+0x40/0xa4 | ||
| kernel: [<ffffffff8117375f>] ? btrfs_drop_snapshot+0x2da/0x664 | ||
| kernel: [<ffffffff8104ff21>] ? finish_task_switch+0x126/0x167 | ||
| kernel: [<ffffffff811850f8>] ? btrfs_clean_one_deleted_snapshot+0xa6/0xb0 | ||
| kernel: [<ffffffff8117eaba>] ? cleaner_kthread+0x13e/0x17b | ||
| kernel: [<ffffffff8117e97c>] ? btrfs_item_end+0x33/0x33 | ||
| kernel: [<ffffffff8104d256>] ? kthread+0x95/0x9d | ||
| kernel: [<ffffffff8104d1c1>] ? kthread_parkme+0x16/0x16 | ||
| kernel: [<ffffffff814a7b5f>] ? ret_from_fork+0x3f/0x70 | ||
| kernel: [<ffffffff8104d1c1>] ? kthread_parkme+0x16/0x16 | ||
|
|
||
| As this affects a released kernel (4.4) we need a minimal fix for | ||
| stable kernels. | ||
|
|
||
| Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=108361 | ||
| Reported-by: Martin Ziegler <ziegler@uni-freiburg.de> | ||
| CC: stable@vger.kernel.org # 4.4 | ||
| CC: Jiri Kosina <jkosina@suse.cz> | ||
| Signed-off-by: David Sterba <dsterba@suse.com> | ||
| Signed-off-by: Chris Mason <clm@fb.com> | ||
| --- | ||
| fs/btrfs/disk-io.c | 1 - | ||
| 1 file changed, 1 deletion(-) | ||
|
|
||
| diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c | ||
| index 26ef141..404e894 100644 | ||
| --- a/fs/btrfs/disk-io.c | ||
| +++ b/fs/btrfs/disk-io.c | ||
| @@ -1787,7 +1787,6 @@ static int cleaner_kthread(void *arg) | ||
| int again; | ||
| struct btrfs_trans_handle *trans; | ||
|
|
||
| - set_freezable(); | ||
| do { | ||
| again = 0; | ||
|
|
||
| -- | ||
| cgit v0.12 | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| From 3e85286e75224fa3f08bdad20e78c8327742634e Mon Sep 17 00:00:00 2001 | ||
| From: Dave Chinner <david@fromorbit.com> | ||
| Date: Tue, 19 Jan 2016 08:21:46 +1100 | ||
| Subject: Revert "xfs: clear PF_NOFREEZE for xfsaild kthread" | ||
|
|
||
| This reverts commit 24ba16bb3d499c49974669cd8429c3e4138ab102 as it | ||
| prevents machines from suspending. This regression occurs when the | ||
| xfsaild is idle on entry to suspend, and so there s no activity to | ||
| wake it from it's idle sleep and hence see that it is supposed to | ||
| freeze. Hence the freezer times out waiting for it and suspend is | ||
| cancelled. | ||
|
|
||
| There is no obvious fix for this short of freezing the filesystem | ||
| properly, so revert this change for now. | ||
|
|
||
| cc: <stable@vger.kernel.org> # 4.4 | ||
| Signed-off-by: Dave Chinner <david@fromorbit.com> | ||
| Acked-by: Jiri Kosina <jkosina@suse.cz> | ||
| Reviewed-by: Brian Foster <bfoster@redhat.com> | ||
| Signed-off-by: Dave Chinner <david@fromorbit.com> | ||
| --- | ||
| fs/xfs/xfs_trans_ail.c | 1 - | ||
| 1 file changed, 1 deletion(-) | ||
|
|
||
| diff --git a/fs/xfs/xfs_trans_ail.c b/fs/xfs/xfs_trans_ail.c | ||
| index aa67339..4f18fd9 100644 | ||
| --- a/fs/xfs/xfs_trans_ail.c | ||
| +++ b/fs/xfs/xfs_trans_ail.c | ||
| @@ -497,7 +497,6 @@ xfsaild( | ||
| long tout = 0; /* milliseconds */ | ||
|
|
||
| current->flags |= PF_MEMALLOC; | ||
| - set_freezable(); | ||
|
|
||
| while (!kthread_should_stop()) { | ||
| if (tout && tout <= 20) | ||
| -- | ||
| cgit v0.12 | ||
|
|
Oops, something went wrong.