From: Sasha Levin Date: Thu, 10 Sep 2020 02:38:08 +0000 (-0400) Subject: Fixes for 4.19 X-Git-Tag: v4.4.236~14 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d1340bc85863cc3172d77959180b9d1bc19fe454;p=thirdparty%2Fkernel%2Fstable-queue.git Fixes for 4.19 Signed-off-by: Sasha Levin --- diff --git a/queue-4.19/alsa-firewire-tascam-exclude-tascam-fe-8-from-detect.patch b/queue-4.19/alsa-firewire-tascam-exclude-tascam-fe-8-from-detect.patch new file mode 100644 index 00000000000..358d29fc667 --- /dev/null +++ b/queue-4.19/alsa-firewire-tascam-exclude-tascam-fe-8-from-detect.patch @@ -0,0 +1,76 @@ +From 33a38418085053e0c236d4901c10542d8d16bc38 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 23 Aug 2020 16:55:37 +0900 +Subject: ALSA; firewire-tascam: exclude Tascam FE-8 from detection + +From: Takashi Sakamoto + +Tascam FE-8 is known to support communication by asynchronous transaction +only. The support can be implemented in userspace application and +snd-firewire-ctl-services project has the support. However, ALSA +firewire-tascam driver is bound to the model. + +This commit changes device entries so that the model is excluded. In a +commit 53b3ffee7885 ("ALSA: firewire-tascam: change device probing +processing"), I addressed to the concern that version field in +configuration differs depending on installed firmware. However, as long +as I checked, the version number is fixed. It's safe to return version +number back to modalias. + +Fixes: 53b3ffee7885 ("ALSA: firewire-tascam: change device probing processing") +Cc: # 4.4+ +Signed-off-by: Takashi Sakamoto +Link: https://lore.kernel.org/r/20200823075537.56255-1-o-takashi@sakamocchi.jp +Signed-off-by: Takashi Iwai +--- + sound/firewire/tascam/tascam.c | 30 +++++++++++++++++++++++++++++- + 1 file changed, 29 insertions(+), 1 deletion(-) + +diff --git a/sound/firewire/tascam/tascam.c b/sound/firewire/tascam/tascam.c +index d3fdc463a884e..1e61cdce28952 100644 +--- a/sound/firewire/tascam/tascam.c ++++ b/sound/firewire/tascam/tascam.c +@@ -225,11 +225,39 @@ static void snd_tscm_remove(struct fw_unit *unit) + } + + static const struct ieee1394_device_id snd_tscm_id_table[] = { ++ // Tascam, FW-1884. + { + .match_flags = IEEE1394_MATCH_VENDOR_ID | +- IEEE1394_MATCH_SPECIFIER_ID, ++ IEEE1394_MATCH_SPECIFIER_ID | ++ IEEE1394_MATCH_VERSION, + .vendor_id = 0x00022e, + .specifier_id = 0x00022e, ++ .version = 0x800000, ++ }, ++ // Tascam, FE-8 (.version = 0x800001) ++ // This kernel module doesn't support FE-8 because the most of features ++ // can be implemented in userspace without any specific support of this ++ // module. ++ // ++ // .version = 0x800002 is unknown. ++ // ++ // Tascam, FW-1082. ++ { ++ .match_flags = IEEE1394_MATCH_VENDOR_ID | ++ IEEE1394_MATCH_SPECIFIER_ID | ++ IEEE1394_MATCH_VERSION, ++ .vendor_id = 0x00022e, ++ .specifier_id = 0x00022e, ++ .version = 0x800003, ++ }, ++ // Tascam, FW-1804. ++ { ++ .match_flags = IEEE1394_MATCH_VENDOR_ID | ++ IEEE1394_MATCH_SPECIFIER_ID | ++ IEEE1394_MATCH_VERSION, ++ .vendor_id = 0x00022e, ++ .specifier_id = 0x00022e, ++ .version = 0x800004, + }, + /* FE-08 requires reverse-engineering because it just has faders. */ + {} +-- +2.25.1 + diff --git a/queue-4.19/block-ensure-bdi-io_pages-is-always-initialized.patch b/queue-4.19/block-ensure-bdi-io_pages-is-always-initialized.patch new file mode 100644 index 00000000000..cd9303abacf --- /dev/null +++ b/queue-4.19/block-ensure-bdi-io_pages-is-always-initialized.patch @@ -0,0 +1,41 @@ +From 97ba89a8afafcb41ae00577766a654369a0e91e3 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 31 Aug 2020 11:20:02 -0600 +Subject: block: ensure bdi->io_pages is always initialized + +From: Jens Axboe + +[ Upstream commit de1b0ee490eafdf65fac9eef9925391a8369f2dc ] + +If a driver leaves the limit settings as the defaults, then we don't +initialize bdi->io_pages. This means that file systems may need to +work around bdi->io_pages == 0, which is somewhat messy. + +Initialize the default value just like we do for ->ra_pages. + +Cc: stable@vger.kernel.org +Fixes: 9491ae4aade6 ("mm: don't cap request size based on read-ahead setting") +Reported-by: OGAWA Hirofumi +Reviewed-by: Christoph Hellwig +Signed-off-by: Jens Axboe +Signed-off-by: Sasha Levin +--- + block/blk-core.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/block/blk-core.c b/block/blk-core.c +index ea33d6abdcfc9..ce3710404544c 100644 +--- a/block/blk-core.c ++++ b/block/blk-core.c +@@ -1036,6 +1036,8 @@ struct request_queue *blk_alloc_queue_node(gfp_t gfp_mask, int node_id, + + q->backing_dev_info->ra_pages = + (VM_MAX_READAHEAD * 1024) / PAGE_SIZE; ++ q->backing_dev_info->io_pages = ++ (VM_MAX_READAHEAD * 1024) / PAGE_SIZE; + q->backing_dev_info->capabilities = BDI_CAP_CGROUP_WRITEBACK; + q->backing_dev_info->name = "block"; + q->node = node_id; +-- +2.25.1 + diff --git a/queue-4.19/series b/queue-4.19/series new file mode 100644 index 00000000000..77078bee134 --- /dev/null +++ b/queue-4.19/series @@ -0,0 +1,2 @@ +alsa-firewire-tascam-exclude-tascam-fe-8-from-detect.patch +block-ensure-bdi-io_pages-is-always-initialized.patch