diff options
Diffstat (limited to '4.4.2/1001_linux-4.4.2.patch')
| -rw-r--r-- | 4.4.2/1001_linux-4.4.2.patch | 5320 |
1 files changed, 0 insertions, 5320 deletions
diff --git a/4.4.2/1001_linux-4.4.2.patch b/4.4.2/1001_linux-4.4.2.patch deleted file mode 100644 index d190146..0000000 --- a/4.4.2/1001_linux-4.4.2.patch +++ /dev/null @@ -1,5320 +0,0 @@ -diff --git a/Makefile b/Makefile -index c6a265b..e7a2958 100644 ---- a/Makefile -+++ b/Makefile -@@ -1,6 +1,6 @@ - VERSION = 4 - PATCHLEVEL = 4 --SUBLEVEL = 1 -+SUBLEVEL = 2 - EXTRAVERSION = - NAME = Blurry Fish Butt - -diff --git a/arch/parisc/include/asm/hugetlb.h b/arch/parisc/include/asm/hugetlb.h -index 7d56a9c..a65d888 100644 ---- a/arch/parisc/include/asm/hugetlb.h -+++ b/arch/parisc/include/asm/hugetlb.h -@@ -54,24 +54,12 @@ static inline pte_t huge_pte_wrprotect(pte_t pte) - return pte_wrprotect(pte); - } - --static inline void huge_ptep_set_wrprotect(struct mm_struct *mm, -- unsigned long addr, pte_t *ptep) --{ -- pte_t old_pte = *ptep; -- set_huge_pte_at(mm, addr, ptep, pte_wrprotect(old_pte)); --} -+void huge_ptep_set_wrprotect(struct mm_struct *mm, -+ unsigned long addr, pte_t *ptep); - --static inline int huge_ptep_set_access_flags(struct vm_area_struct *vma, -+int huge_ptep_set_access_flags(struct vm_area_struct *vma, - unsigned long addr, pte_t *ptep, -- pte_t pte, int dirty) --{ -- int changed = !pte_same(*ptep, pte); -- if (changed) { -- set_huge_pte_at(vma->vm_mm, addr, ptep, pte); -- flush_tlb_page(vma, addr); -- } -- return changed; --} -+ pte_t pte, int dirty); - - static inline pte_t huge_ptep_get(pte_t *ptep) - { -diff --git a/arch/parisc/include/uapi/asm/siginfo.h b/arch/parisc/include/uapi/asm/siginfo.h -index d703472..1c75565 100644 ---- a/arch/parisc/include/uapi/asm/siginfo.h -+++ b/arch/parisc/include/uapi/asm/siginfo.h -@@ -1,6 +1,10 @@ - #ifndef _PARISC_SIGINFO_H - #define _PARISC_SIGINFO_H - -+#if defined(__LP64__) -+#define __ARCH_SI_PREAMBLE_SIZE (4 * sizeof(int)) -+#endif -+ - #include <asm-generic/siginfo.h> - - #undef NSIGTRAP -diff --git a/arch/parisc/mm/hugetlbpage.c b/arch/parisc/mm/hugetlbpage.c -index f6fdc77..54ba392 100644 ---- a/arch/parisc/mm/hugetlbpage.c -+++ b/arch/parisc/mm/hugetlbpage.c -@@ -105,15 +105,13 @@ static inline void purge_tlb_entries_huge(struct mm_struct *mm, unsigned long ad - addr |= _HUGE_PAGE_SIZE_ENCODING_DEFAULT; - - for (i = 0; i < (1 << (HPAGE_SHIFT-REAL_HPAGE_SHIFT)); i++) { -- mtsp(mm->context, 1); -- pdtlb(addr); -- if (unlikely(split_tlb)) -- pitlb(addr); -+ purge_tlb_entries(mm, addr); - addr += (1UL << REAL_HPAGE_SHIFT); - } - } - --void set_huge_pte_at(struct mm_struct *mm, unsigned long addr, -+/* __set_huge_pte_at() must be called holding the pa_tlb_lock. */ -+static void __set_huge_pte_at(struct mm_struct *mm, unsigned long addr, - pte_t *ptep, pte_t entry) - { - unsigned long addr_start; -@@ -123,14 +121,9 @@ void set_huge_pte_at(struct mm_struct *mm, unsigned long addr, - addr_start = addr; - - for (i = 0; i < (1 << HUGETLB_PAGE_ORDER); i++) { -- /* Directly write pte entry. We could call set_pte_at(mm, addr, ptep, entry) -- * instead, but then we get double locking on pa_tlb_lock. */ -- *ptep = entry; -+ set_pte(ptep, entry); - ptep++; - -- /* Drop the PAGE_SIZE/non-huge tlb entry */ -- purge_tlb_entries(mm, addr); -- - addr += PAGE_SIZE; - pte_val(entry) += PAGE_SIZE; - } -@@ -138,18 +131,61 @@ void set_huge_pte_at(struct mm_struct *mm, unsigned long addr, - purge_tlb_entries_huge(mm, addr_start); - } - -+void set_huge_pte_at(struct mm_struct *mm, unsigned long addr, -+ pte_t *ptep, pte_t entry) -+{ -+ unsigned long flags; -+ -+ purge_tlb_start(flags); -+ __set_huge_pte_at(mm, addr, ptep, entry); -+ purge_tlb_end(flags); -+} -+ - - pte_t huge_ptep_get_and_clear(struct mm_struct *mm, unsigned long addr, - pte_t *ptep) - { -+ unsigned long flags; - pte_t entry; - -+ purge_tlb_start(flags); - entry = *ptep; -- set_huge_pte_at(mm, addr, ptep, __pte(0)); -+ __set_huge_pte_at(mm, addr, ptep, __pte(0)); -+ purge_tlb_end(flags); - - return entry; - } - -+ -+void huge_ptep_set_wrprotect(struct mm_struct *mm, -+ unsigned long addr, pte_t *ptep) -+{ -+ unsigned long flags; -+ pte_t old_pte; -+ -+ purge_tlb_start(flags); -+ old_pte = *ptep; -+ __set_huge_pte_at(mm, addr, ptep, pte_wrprotect(old_pte)); -+ purge_tlb_end(flags); -+} -+ -+int huge_ptep_set_access_flags(struct vm_area_struct *vma, -+ unsigned long addr, pte_t *ptep, -+ pte_t pte, int dirty) -+{ -+ unsigned long flags; -+ int changed; -+ -+ purge_tlb_start(flags); -+ changed = !pte_same(*ptep, pte); -+ if (changed) { -+ __set_huge_pte_at(vma->vm_mm, addr, ptep, pte); -+ } -+ purge_tlb_end(flags); -+ return changed; -+} -+ -+ - int pmd_huge(pmd_t pmd) - { - return 0; -diff --git a/arch/x86/crypto/chacha20-ssse3-x86_64.S b/arch/x86/crypto/chacha20-ssse3-x86_64.S -index 712b130..3a33124 100644 ---- a/arch/x86/crypto/chacha20-ssse3-x86_64.S -+++ b/arch/x86/crypto/chacha20-ssse3-x86_64.S -@@ -157,7 +157,9 @@ ENTRY(chacha20_4block_xor_ssse3) - # done with the slightly better performing SSSE3 byte shuffling, - # 7/12-bit word rotation uses traditional shift+OR. - -- sub $0x40,%rsp -+ mov %rsp,%r11 -+ sub $0x80,%rsp -+ and $~63,%rsp - - # x0..15[0-3] = s0..3[0..3] - movq 0x00(%rdi),%xmm1 -@@ -620,6 +622,6 @@ ENTRY(chacha20_4block_xor_ssse3) - pxor %xmm1,%xmm15 - movdqu %xmm15,0xf0(%rsi) - -- add $0x40,%rsp -+ mov %r11,%rsp - ret - ENDPROC(chacha20_4block_xor_ssse3) -diff --git a/block/blk-merge.c b/block/blk-merge.c -index e01405a..b966db8 100644 ---- a/block/blk-merge.c -+++ b/block/blk-merge.c -@@ -68,6 +68,18 @@ static struct bio *blk_bio_write_same_split(struct request_queue *q, - return bio_split(bio, q->limits.max_write_same_sectors, GFP_NOIO, bs); - } - -+static inline unsigned get_max_io_size(struct request_queue *q, -+ struct bio *bio) -+{ -+ unsigned sectors = blk_max_size_offset(q, bio->bi_iter.bi_sector); -+ unsigned mask = queue_logical_block_size(q) - 1; -+ -+ /* aligned to logical block size */ -+ sectors &= ~(mask >> 9); -+ -+ return sectors; -+} -+ - static struct bio *blk_bio_segment_split(struct request_queue *q, - struct bio *bio, - struct bio_set *bs, -@@ -79,11 +91,9 @@ static struct bio *blk_bio_segment_split(struct request_queue *q, - unsigned front_seg_size = bio->bi_seg_front_size; - bool do_split = true; - struct bio *new = NULL; -+ const unsigned max_sectors = get_max_io_size(q, bio); - - bio_for_each_segment(bv, bio, iter) { -- if (sectors + (bv.bv_len >> 9) > queue_max_sectors(q)) -- goto split; -- - /* - * If the queue doesn't support SG gaps and adding this - * offset would create a gap, disallow it. -@@ -91,6 +101,21 @@ static struct bio *blk_bio_segment_split(struct request_queue *q, - if (bvprvp && bvec_gap_to_prev(q, bvprvp, bv.bv_offset)) - goto split; - -+ if (sectors + (bv.bv_len >> 9) > max_sectors) { -+ /* -+ * Consider this a new segment if we're splitting in -+ * the middle of this vector. -+ */ -+ if (nsegs < queue_max_segments(q) && -+ sectors < max_sectors) { -+ nsegs++; -+ sectors = max_sectors; -+ } -+ if (sectors) -+ goto split; -+ /* Make this single bvec as the 1st segment */ -+ } -+ - if (bvprvp && blk_queue_cluster(q)) { - if (seg_size + bv.bv_len > queue_max_segment_size(q)) - goto new_segment; -diff --git a/crypto/af_alg.c b/crypto/af_alg.c -index a8e7aa3..f5e18c2 100644 ---- a/crypto/af_alg.c -+++ b/crypto/af_alg.c -@@ -76,6 +76,8 @@ int af_alg_register_type(const struct af_alg_type *type) - goto unlock; - - type->ops->owner = THIS_MODULE; -+ if (type->ops_nokey) -+ type->ops_nokey->owner = THIS_MODULE; - node->type = type; - list_add(&node->list, &alg_types); - err = 0; -@@ -125,6 +127,26 @@ int af_alg_release(struct socket *sock) - } - EXPORT_SYMBOL_GPL(af_alg_release); - -+void af_alg_release_parent(struct sock *sk) -+{ -+ struct alg_sock *ask = alg_sk(sk); -+ unsigned int nokey = ask->nokey_refcnt; -+ bool last = nokey && !ask->refcnt; -+ -+ sk = ask->parent; -+ ask = alg_sk(sk); -+ -+ lock_sock(sk); -+ ask->nokey_refcnt -= nokey; -+ if (!last) -+ last = !--ask->refcnt; -+ release_sock(sk); -+ -+ if (last) -+ sock_put(sk); -+} -+EXPORT_SYMBOL_GPL(af_alg_release_parent); -+ - static int alg_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len) - { - const u32 forbidden = CRYPTO_ALG_INTERNAL; -@@ -133,6 +155,7 @@ static int alg_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len) - struct sockaddr_alg *sa = (void *)uaddr; - const struct af_alg_type *type; - void *private; -+ int err; - - if (sock->state == SS_CONNECTED) - return -EINVAL; -@@ -160,16 +183,22 @@ static int alg_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len) - return PTR_ERR(private); - } - -+ err = -EBUSY; - lock_sock(sk); -+ if (ask->refcnt | ask->nokey_refcnt) -+ goto unlock; - - swap(ask->type, type); - swap(ask->private, private); - -+ err = 0; -+ -+unlock: - release_sock(sk); - - alg_do_release(type, private); - -- return 0; -+ return err; - } - - static int alg_setkey(struct sock *sk, char __user *ukey, -@@ -202,11 +231,15 @@ static int alg_setsockopt(struct socket *sock, int level, int optname, - struct sock *sk = sock->sk; - struct alg_sock *ask = alg_sk(sk); - const struct af_alg_type *type; -- int err = -ENOPROTOOPT; -+ int err = -EBUSY; - - lock_sock(sk); -+ if (ask->refcnt) -+ goto unlock; -+ - type = ask->type; - -+ err = -ENOPROTOOPT; - if (level != SOL_ALG || !type) - goto unlock; - -@@ -238,6 +271,7 @@ int af_alg_accept(struct sock *sk, struct socket *newsock) - struct alg_sock *ask = alg_sk(sk); - const struct af_alg_type *type; - struct sock *sk2; -+ unsigned int nokey; - int err; - - lock_sock(sk); -@@ -257,20 +291,29 @@ int af_alg_accept(struct sock *sk, struct socket *newsock) - security_sk_clone(sk, sk2); - - err = type->accept(ask->private, sk2); -- if (err) { -- sk_free(sk2); -+ -+ nokey = err == -ENOKEY; -+ if (nokey && type->accept_nokey) -+ err = type->accept_nokey(ask->private, sk2); -+ -+ if (err) - goto unlock; -- } - - sk2->sk_family = PF_ALG; - -- sock_hold(sk); -+ if (nokey || !ask->refcnt++) -+ sock_hold(sk); -+ ask->nokey_refcnt += nokey; - alg_sk(sk2)->parent = sk; - alg_sk(sk2)->type = type; -+ alg_sk(sk2)->nokey_refcnt = nokey; - - newsock->ops = type->ops; - newsock->state = SS_CONNECTED; - -+ if (nokey) -+ newsock->ops = type->ops_nokey; -+ - err = 0; - - unlock: -diff --git a/crypto/ahash.c b/crypto/ahash.c -index 9c1dc8d..d19b523 100644 ---- a/crypto/ahash.c -+++ b/crypto/ahash.c -@@ -451,6 +451,7 @@ static int crypto_ahash_init_tfm(struct crypto_tfm *tfm) - struct ahash_alg *alg = crypto_ahash_alg(hash); - - hash->setkey = ahash_nosetkey; -+ hash->has_setkey = false; - hash->export = ahash_no_export; - hash->import = ahash_no_import; - -@@ -463,8 +464,10 @@ static int crypto_ahash_init_tfm(struct crypto_tfm *tfm) - hash->finup = alg->finup ?: ahash_def_finup; - hash->digest = alg->digest; - -- if (alg->setkey) -+ if (alg->setkey) { - hash->setkey = alg->setkey; -+ hash->has_setkey = true; -+ } - if (alg->export) - hash->export = alg->export; - if (alg->import) -diff --git a/crypto/algif_hash.c b/crypto/algif_hash.c -index b4c24fe..68a5cea 100644 ---- a/crypto/algif_hash.c -+++ b/crypto/algif_hash.c -@@ -34,6 +34,11 @@ struct hash_ctx { - struct ahash_request req; - }; - -+struct algif_hash_tfm { -+ struct crypto_ahash *hash; -+ bool has_key; -+}; -+ - static int hash_sendmsg(struct socket *sock, struct msghdr *msg, - size_t ignored) - { -@@ -49,7 +54,8 @@ static int hash_sendmsg(struct socket *sock, struct msghdr *msg, - - lock_sock(sk); - if (!ctx->more) { -- err = crypto_ahash_init(&ctx->req); -+ err = af_alg_wait_for_completion(crypto_ahash_init(&ctx->req), -+ &ctx->completion); - if (err) - goto unlock; - } -@@ -120,6 +126,7 @@ static ssize_t hash_sendpage(struct socket *sock, struct page *page, - } else { - if (!ctx->more) { - err = crypto_ahash_init(&ctx->req); -+ err = af_alg_wait_for_completion(err, &ctx->completion); - if (err) - goto unlock; - } -@@ -235,19 +242,151 @@ static struct proto_ops algif_hash_ops = { - .accept = hash_accept, - }; - -+static int hash_check_key(struct socket *sock) -+{ -+ int err = 0; -+ struct sock *psk; -+ struct alg_sock *pask; -+ struct algif_hash_tfm *tfm; -+ struct sock *sk = sock->sk; -+ struct alg_sock *ask = alg_sk(sk); -+ -+ lock_sock(sk); -+ if (ask->refcnt) -+ goto unlock_child; -+ -+ psk = ask->parent; -+ pask = alg_sk(ask->parent); -+ tfm = pask->private; -+ -+ err = -ENOKEY; -+ lock_sock_nested(psk, SINGLE_DEPTH_NESTING); -+ if (!tfm->has_key) -+ goto unlock; -+ -+ if (!pask->refcnt++) -+ sock_hold(psk); -+ -+ ask->refcnt = 1; -+ sock_put(psk); -+ -+ err = 0; -+ -+unlock: -+ release_sock(psk); -+unlock_child: -+ release_sock(sk); -+ -+ return err; -+} -+ -+static int hash_sendmsg_nokey(struct socket *sock, struct msghdr *msg, -+ size_t size) -+{ -+ int err; -+ -+ err = hash_check_key(sock); -+ if (err) -+ return err; -+ -+ return hash_sendmsg(sock, msg, size); -+} -+ -+static ssize_t hash_sendpage_nokey(struct socket *sock, struct page *page, -+ int offset, size_t size, int flags) -+{ -+ int err; -+ -+ err = hash_check_key(sock); -+ if (err) -+ return err; -+ -+ return hash_sendpage(sock, page, offset, size, flags); -+} -+ -+static int hash_recvmsg_nokey(struct socket *sock, struct msghdr *msg, -+ size_t ignored, int flags) -+{ -+ int err; -+ -+ err = hash_check_key(sock); -+ if (err) -+ return err; -+ -+ return hash_recvmsg(sock, msg, ignored, flags); -+} -+ -+static int hash_accept_nokey(struct socket *sock, struct socket *newsock, -+ int flags) -+{ -+ int err; -+ -+ err = hash_check_key(sock); -+ if (err) -+ return err; -+ -+ return hash_accept(sock, newsock, flags); -+} -+ -+static struct proto_ops algif_hash_ops_nokey = { -+ .family = PF_ALG, -+ -+ .connect = sock_no_connect, -+ .socketpair = sock_no_socketpair, -+ .getname = sock_no_getname, -+ .ioctl = sock_no_ioctl, -+ .listen = sock_no_listen, -+ .shutdown = sock_no_shutdown, -+ .getsockopt = sock_no_getsockopt, -+ .mmap = sock_no_mmap, -+ .bind = sock_no_bind, -+ .setsockopt = sock_no_setsockopt, -+ .poll = sock_no_poll, -+ -+ .release = af_alg_release, -+ .sendmsg = hash_sendmsg_nokey, -+ .sendpage = hash_sendpage_nokey, -+ .recvmsg = hash_recvmsg_nokey, -+ .accept = hash_accept_nokey, -+}; -+ - static void *hash_bind(const char *name, u32 type, u32 mask) - { -- return crypto_alloc_ahash(name, type, mask); -+ struct algif_hash_tfm *tfm; -+ struct crypto_ahash *hash; -+ -+ tfm = kzalloc(sizeof(*tfm), GFP_KERNEL); -+ if (!tfm) -+ return ERR_PTR(-ENOMEM); -+ -+ hash = crypto_alloc_ahash(name, type, mask); -+ if (IS_ERR(hash)) { -+ kfree(tfm); -+ return ERR_CAST(hash); -+ } -+ -+ tfm->hash = hash; -+ -+ return tfm; - } - - static void hash_release(void *private) - { -- crypto_free_ahash(private); -+ struct algif_hash_tfm *tfm = private; -+ -+ crypto_free_ahash(tfm->hash); -+ kfree(tfm); - } - - static int hash_setkey(void *private, const u8 *key, unsigned int keylen) - { -- return crypto_ahash_setkey(private, key, keylen); -+ struct algif_hash_tfm *tfm = private; -+ int err; -+ -+ err = crypto_ahash_setkey(tfm->hash, key, keylen); -+ tfm->has_key = !err; -+ -+ return err; - } - - static void hash_sock_destruct(struct sock *sk) -@@ -261,12 +400,14 @@ static void hash_sock_destruct(struct sock *sk) - af_alg_release_parent(sk); - } - --static int hash_accept_parent(void *private, struct sock *sk) -+static int hash_accept_parent_nokey(void *private, struct sock *sk) - { - struct hash_ctx *ctx; - struct alg_sock *ask = alg_sk(sk); -- unsigned len = sizeof(*ctx) + crypto_ahash_reqsize(private); -- unsigned ds = crypto_ahash_digestsize(private); -+ struct algif_hash_tfm *tfm = private; -+ struct crypto_ahash *hash = tfm->hash; -+ unsigned len = sizeof(*ctx) + crypto_ahash_reqsize(hash); -+ unsigned ds = crypto_ahash_digestsize(hash); - - ctx = sock_kmalloc(sk, len, GFP_KERNEL); - if (!ctx) -@@ -286,7 +427,7 @@ static int hash_accept_parent(void *private, struct sock *sk) - - ask->private = ctx; - -- ahash_request_set_tfm(&ctx->req, private); -+ ahash_request_set_tfm(&ctx->req, hash); - ahash_request_set_callback(&ctx->req, CRYPTO_TFM_REQ_MAY_BACKLOG, - af_alg_complete, &ctx->completion); - -@@ -295,12 +436,24 @@ static int hash_accept_parent(void *private, struct sock *sk) - return 0; - } - -+static int hash_accept_parent(void *private, struct sock *sk) -+{ -+ struct algif_hash_tfm *tfm = private; -+ -+ if (!tfm->has_key && crypto_ahash_has_setkey(tfm->hash)) -+ return -ENOKEY; -+ -+ return hash_accept_parent_nokey(private, sk); -+} -+ - static const struct af_alg_type algif_type_hash = { - .bind = hash_bind, - .release = hash_release, - .setkey = hash_setkey, - .accept = hash_accept_parent, -+ .accept_nokey = hash_accept_parent_nokey, - .ops = &algif_hash_ops, -+ .ops_nokey = &algif_hash_ops_nokey, - .name = "hash", - .owner = THIS_MODULE - }; -diff --git a/crypto/algif_skcipher.c b/crypto/algif_skcipher.c -index 634b4d1..f5e9f93 100644 ---- a/crypto/algif_skcipher.c -+++ b/crypto/algif_skcipher.c -@@ -31,6 +31,11 @@ struct skcipher_sg_list { - struct scatterlist sg[0]; - }; - -+struct skcipher_tfm { -+ struct crypto_skcipher *skcipher; -+ bool has_key; -+}; -+ - struct skcipher_ctx { - struct list_head tsgl; - struct af_alg_sgl rsgl; -@@ -60,18 +65,10 @@ struct skcipher_async_req { - struct skcipher_async_rsgl first_sgl; - struct list_head list; - struct scatterlist *tsg; -- char iv[]; -+ atomic_t *inflight; -+ struct skcipher_request req; - }; - --#define GET_SREQ(areq, ctx) (struct skcipher_async_req *)((char *)areq + \ -- crypto_skcipher_reqsize(crypto_skcipher_reqtfm(&ctx->req))) -- --#define GET_REQ_SIZE(ctx) \ -- crypto_skcipher_reqsize(crypto_skcipher_reqtfm(&ctx->req)) -- --#define GET_IV_SIZE(ctx) \ -- crypto_skcipher_ivsize(crypto_skcipher_reqtfm(&ctx->req)) -- - #define MAX_SGL_ENTS ((4096 - sizeof(struct skcipher_sg_list)) / \ - sizeof(struct scatterlist) - 1) - -@@ -97,15 +94,12 @@ static void skcipher_free_async_sgls(struct skcipher_async_req *sreq) - - static void skcipher_async_cb(struct crypto_async_request *req, int err) - { -- struct sock *sk = req->data; -- struct alg_sock *ask = alg_sk(sk); -- struct skcipher_ctx *ctx = ask->private; -- struct skcipher_async_req *sreq = GET_SREQ(req, ctx); -+ struct skcipher_async_req *sreq = req->data; - struct kiocb *iocb = sreq->iocb; - -- atomic_dec(&ctx->inflight); -+ atomic_dec(sreq->inflight); - skcipher_free_async_sgls(sreq); -- kfree(req); -+ kzfree(sreq); - iocb->ki_complete(iocb, err, err); - } - -@@ -301,8 +295,11 @@ static int skcipher_sendmsg(struct socket *sock, struct msghdr *msg, - { - struct sock *sk = sock->sk; - struct alg_sock *ask = alg_sk(sk); -+ struct sock *psk = ask->parent; -+ struct alg_sock *pask = alg_sk(psk); - struct skcipher_ctx *ctx = ask->private; -- struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(&ctx->req); -+ struct skcipher_tfm *skc = pask->private; -+ struct crypto_skcipher *tfm = skc->skcipher; - unsigned ivsize = crypto_skcipher_ivsize(tfm); - struct skcipher_sg_list *sgl; - struct af_alg_control con = {}; -@@ -387,7 +384,8 @@ static int skcipher_sendmsg(struct socket *sock, struct msghdr *msg, - - sgl = list_entry(ctx->tsgl.prev, struct skcipher_sg_list, list); - sg = sgl->sg; -- sg_unmark_end(sg + sgl->cur); -+ if (sgl->cur) -+ sg_unmark_end(sg + sgl->cur - 1); - do { - i = sgl->cur; - plen = min_t(int, len, PAGE_SIZE); -@@ -503,37 +501,43 @@ static int skcipher_recvmsg_async(struct socket *sock, struct msghdr *msg, - { - struct sock *sk = sock->sk; - struct alg_sock *ask = alg_sk(sk); -+ struct sock *psk = ask->parent; -+ struct alg_sock *pask = alg_sk(psk); - struct skcipher_ctx *ctx = ask->private; -+ struct skcipher_tfm *skc = pask->private; -+ struct crypto_skcipher *tfm = skc->skcipher; - struct skcipher_sg_list *sgl; - struct scatterlist *sg; - struct skcipher_async_req *sreq; - struct skcipher_request *req; - struct skcipher_async_rsgl *last_rsgl = NULL; -- unsigned int txbufs = 0, len = 0, tx_nents = skcipher_all_sg_nents(ctx); -- unsigned int reqlen = sizeof(struct skcipher_async_req) + -- GET_REQ_SIZE(ctx) + GET_IV_SIZE(ctx); -+ unsigned int txbufs = 0, len = 0, tx_nents; -+ unsigned int reqsize = crypto_skcipher_reqsize(tfm); -+ unsigned int ivsize = crypto_skcipher_ivsize(tfm); - int err = -ENOMEM; - bool mark = false; -+ char *iv; - -- lock_sock(sk); -- req = kmalloc(reqlen, GFP_KERNEL); -- if (unlikely(!req)) -- goto unlock; -+ sreq = kzalloc(sizeof(*sreq) + reqsize + ivsize, GFP_KERNEL); -+ if (unlikely(!sreq)) -+ goto out; - -- sreq = GET_SREQ(req, ctx); -+ req = &sreq->req; -+ iv = (char *)(req + 1) + reqsize; - sreq->iocb = msg->msg_iocb; -- memset(&sreq->first_sgl, '\0', sizeof(struct skcipher_async_rsgl)); - INIT_LIST_HEAD(&sreq->list); -+ sreq->inflight = &ctx->inflight; -+ -+ lock_sock(sk); -+ tx_nents = skcipher_all_sg_nents(ctx); - sreq->tsg = kcalloc(tx_nents, sizeof(*sg), GFP_KERNEL); -- if (unlikely(!sreq->tsg)) { -- kfree(req); -+ if (unlikely(!sreq->tsg)) - goto unlock; -- } - sg_init_table(sreq->tsg, tx_nents); -- memcpy(sreq->iv, ctx->iv, GET_IV_SIZE(ctx)); -- skcipher_request_set_tfm(req, crypto_skcipher_reqtfm(&ctx->req)); -- skcipher_request_set_callback(req, CRYPTO_TFM_REQ_MAY_BACKLOG, -- skcipher_async_cb, sk); -+ memcpy(iv, ctx->iv, ivsize); -+ skcipher_request_set_tfm(req, tfm); -+ skcipher_request_set_callback(req, CRYPTO_TFM_REQ_MAY_SLEEP, -+ skcipher_async_cb, sreq); - - while (iov_iter_count(&msg->msg_iter)) { - struct skcipher_async_rsgl *rsgl; -@@ -609,20 +613,22 @@ static int skcipher_recvmsg_async(struct socket *sock, struct msghdr *msg, - sg_mark_end(sreq->tsg + txbufs - 1); - - skcipher_request_set_crypt(req, sreq->tsg, sreq->first_sgl.sgl.sg, -- len, sreq->iv); -+ len, iv); - err = ctx->enc ? crypto_skcipher_encrypt(req) : - crypto_skcipher_decrypt(req); - if (err == -EINPROGRESS) { - atomic_inc(&ctx->inflight); - err = -EIOCBQUEUED; -+ sreq = NULL; - goto unlock; - } - free: - skcipher_free_async_sgls(sreq); -- kfree(req); - unlock: - skcipher_wmem_wakeup(sk); - release_sock(sk); -+ kzfree(sreq); -+out: - return err; - } - -@@ -631,9 +637,12 @@ static int skcipher_recvmsg_sync(struct socket *sock, struct msghdr *msg, - { - struct sock *sk = sock->sk; - struct alg_sock *ask = alg_sk(sk); -+ struct sock *psk = ask->parent; -+ struct alg_sock *pask = alg_sk(psk); - struct skcipher_ctx *ctx = ask->private; -- unsigned bs = crypto_skcipher_blocksize(crypto_skcipher_reqtfm( -- &ctx->req)); -+ struct skcipher_tfm *skc = pask->private; -+ struct crypto_skcipher *tfm = skc->skcipher; -+ unsigned bs = crypto_skcipher_blocksize(tfm); - struct skcipher_sg_list *sgl; - struct scatterlist *sg; - int err = -EAGAIN; -@@ -642,13 +651,6 @@ static int skcipher_recvmsg_sync(struct socket *sock, struct msghdr *msg, - - lock_sock(sk); - while (msg_data_left(msg)) { -- sgl = list_first_entry(&ctx->tsgl, -- struct skcipher_sg_list, list); -- sg = sgl->sg; -- -- while (!sg->length) -- sg++; -- - if (!ctx->used) { - err = skcipher_wait_for_data(sk, flags); - if (err) -@@ -669,6 +671,13 @@ static int skcipher_recvmsg_sync(struct socket *sock, struct msghdr *msg, - if (!used) - goto free; - -+ sgl = list_first_entry(&ctx->tsgl, -+ struct skcipher_sg_list, list); -+ sg = sgl->sg; -+ -+ while (!sg->length) -+ sg++; -+ - skcipher_request_set_crypt(&ctx->req, sg, ctx->rsgl.sg, used, - ctx->iv); - -@@ -748,19 +757,139 @@ static struct proto_ops algif_skcipher_ops = { - .poll = skcipher_poll, - }; - -+static int skcipher_check_key(struct socket *sock) -+{ -+ int err = 0; -+ struct sock *psk; -+ struct alg_sock *pask; -+ struct skcipher_tfm *tfm; -+ struct sock *sk = sock->sk; -+ struct alg_sock *ask = alg_sk(sk); -+ -+ lock_sock(sk); -+ if (ask->refcnt) -+ goto unlock_child; -+ -+ psk = ask->parent; -+ pask = alg_sk(ask->parent); -+ tfm = pask->private; -+ -+ err = -ENOKEY; -+ lock_sock_nested(psk, SINGLE_DEPTH_NESTING); -+ if (!tfm->has_key) -+ goto unlock; -+ -+ if (!pask->refcnt++) -+ sock_hold(psk); -+ -+ ask->refcnt = 1; -+ sock_put(psk); -+ -+ err = 0; -+ -+unlock: -+ release_sock(psk); -+unlock_child: -+ release_sock(sk); -+ -+ return err; -+} -+ -+static int skcipher_sendmsg_nokey(struct socket *sock, struct msghdr *msg, -+ size_t size) -+{ -+ int err; -+ -+ err = skcipher_check_key(sock); -+ if (err) -+ return err; -+ -+ return skcipher_sendmsg(sock, msg, size); -+} -+ -+static ssize_t skcipher_sendpage_nokey(struct socket *sock, struct page *page, -+ int offset, size_t size, int flags) -+{ -+ int err; -+ -+ err = skcipher_check_key(sock); -+ if (err) -+ return err; -+ -+ return skcipher_sendpage(sock, page, offset, size, flags); -+} -+ -+static int skcipher_recvmsg_nokey(struct socket *sock, struct msghdr *msg, -+ size_t ignored, int flags) -+{ -+ int err; -+ -+ err = skcipher_check_key(sock); -+ if (err) -+ return err; -+ -+ return skcipher_recvmsg(sock, msg, ignored, flags); -+} -+ -+static struct proto_ops algif_skcipher_ops_nokey = { -+ .family = PF_ALG, -+ -+ .connect = sock_no_connect, -+ .socketpair = sock_no_socketpair, -+ .getname = sock_no_getname, -+ .ioctl = sock_no_ioctl, -+ .listen = sock_no_listen, -+ .shutdown = sock_no_shutdown, -+ .getsockopt = sock_no_getsockopt, -+ .mmap = sock_no_mmap, -+ .bind = sock_no_bind, -+ .accept = sock_no_accept, -+ .setsockopt = sock_no_setsockopt, -+ -+ .release = af_alg_release, -+ .sendmsg = skcipher_sendmsg_nokey, -+ .sendpage = skcipher_sendpage_nokey, -+ .recvmsg = skcipher_recvmsg_nokey, -+ .poll = skcipher_poll, -+}; -+ - static void *skcipher_bind(const char *name, u32 type, u32 mask) - { -- return crypto_alloc_skcipher(name, type, mask); -+ struct skcipher_tfm *tfm; -+ struct crypto_skcipher *skcipher; -+ -+ tfm = kzalloc(sizeof(*tfm), GFP_KERNEL); -+ if (!tfm) -+ return ERR_PTR(-ENOMEM); -+ -+ skcipher = crypto_alloc_skcipher(name, type, mask); -+ if (IS_ERR(skcipher)) { -+ kfree(tfm); -+ return ERR_CAST(skcipher); -+ } -+ -+ tfm->skcipher = skcipher; -+ -+ return tfm; - } - - static void skcipher_release(void *private) - { -- crypto_free_skcipher(private); -+ struct skcipher_tfm *tfm = private; -+ -+ crypto_free_skcipher(tfm->skcipher); -+ kfree(tfm); - } - - static int skcipher_setkey(void *private, const u8 *key, unsigned int keylen) - { -- return crypto_skcipher_setkey(private, key, keylen); -+ struct skcipher_tfm *tfm = private; -+ int err; -+ -+ err = crypto_skcipher_setkey(tfm->skcipher, key, keylen); -+ tfm->has_key = !err; -+ -+ return err; - } - - static void skcipher_wait(struct sock *sk) -@@ -788,24 +917,26 @@ static void skcipher_sock_destruct(struct sock *sk) - af_alg_release_parent(sk); - } - --static int skcipher_accept_parent(void *private, struct sock *sk) -+static int skcipher_accept_parent_nokey(void *private, struct sock *sk) - { - struct skcipher_ctx *ctx; - struct alg_sock *ask = alg_sk(sk); -- unsigned int len = sizeof(*ctx) + crypto_skcipher_reqsize(private); -+ struct skcipher_tfm *tfm = private; -+ struct crypto_skcipher *skcipher = tfm->skcipher; -+ unsigned int len = sizeof(*ctx) + crypto_skcipher_reqsize(skcipher); - - ctx = sock_kmalloc(sk, len, GFP_KERNEL); - if (!ctx) - return -ENOMEM; - -- ctx->iv = sock_kmalloc(sk, crypto_skcipher_ivsize(private), -+ ctx->iv = sock_kmalloc(sk, crypto_skcipher_ivsize(skcipher), - GFP_KERNEL); - if (!ctx->iv) { - sock_kfree_s(sk, ctx, len); - return -ENOMEM; - } - -- memset(ctx->iv, 0, crypto_skcipher_ivsize(private)); -+ memset(ctx->iv, 0, crypto_skcipher_ivsize(skcipher)); - - INIT_LIST_HEAD(&ctx->tsgl); - ctx->len = len; -@@ -818,8 +949,9 @@ static int skcipher_accept_parent(void *private, struct sock *sk) - - ask->private = ctx; - -- skcipher_request_set_tfm(&ctx->req, private); -- skcipher_request_set_callback(&ctx->req, CRYPTO_TFM_REQ_MAY_BACKLOG, -+ skcipher_request_set_tfm(&ctx->req, skcipher); -+ skcipher_request_set_callback(&ctx->req, CRYPTO_TFM_REQ_MAY_SLEEP | -+ CRYPTO_TFM_REQ_MAY_BACKLOG, - af_alg_complete, &ctx->completion); - - sk->sk_destruct = skcipher_sock_destruct; -@@ -827,12 +959,24 @@ static int skcipher_accept_parent(void *private, struct sock *sk) - return 0; - } - -+static int skcipher_accept_parent(void *private, struct sock *sk) -+{ -+ struct skcipher_tfm *tfm = private; -+ -+ if (!tfm->has_key && crypto_skcipher_has_setkey(tfm->skcipher)) -+ return -ENOKEY; -+ -+ return skcipher_accept_parent_nokey(private, sk); -+} -+ - static const struct af_alg_type algif_type_skcipher = { - .bind = skcipher_bind, - .release = skcipher_release, - .setkey = skcipher_setkey, - .accept = skcipher_accept_parent, -+ .accept_nokey = skcipher_accept_parent_nokey, - .ops = &algif_skcipher_ops, -+ .ops_nokey = &algif_skcipher_ops_nokey, - .name = "skcipher", - .owner = THIS_MODULE - }; -diff --git a/crypto/crc32c_generic.c b/crypto/crc32c_generic.c -index 06f1b60..4c0a0e2 100644 ---- a/crypto/crc32c_generic.c -+++ b/crypto/crc32c_generic.c -@@ -172,4 +172,3 @@ MODULE_DESCRIPTION("CRC32c (Castagnoli) calculations wrapper for lib/crc32c"); - MODULE_LICENSE("GPL"); - MODULE_ALIAS_CRYPTO("crc32c"); - MODULE_ALIAS_CRYPTO("crc32c-generic"); --MODULE_SOFTDEP("pre: crc32c"); -diff --git a/crypto/crypto_user.c b/crypto/crypto_user.c -index 237f379..43fe85f 100644 ---- a/crypto/crypto_user.c -+++ b/crypto/crypto_user.c -@@ -499,6 +499,7 @@ static int crypto_user_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh) - if (link->dump == NULL) - return -EINVAL; - -+ down_read(&crypto_alg_sem); - list_for_each_entry(alg, &crypto_alg_list, cra_list) - dump_alloc += CRYPTO_REPORT_MAXSIZE; - -@@ -508,8 +509,11 @@ static int crypto_user_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh) - .done = link->done, - .min_dump_alloc = dump_alloc, - }; -- return netlink_dump_start(crypto_nlsk, skb, nlh, &c); -+ err = netlink_dump_start(crypto_nlsk, skb, nlh, &c); - } -+ up_read(&crypto_alg_sem); -+ -+ return err; - } - - err = nlmsg_parse(nlh, crypto_msg_min[type], attrs, CRYPTOCFGA_MAX, -diff --git a/crypto/shash.c b/crypto/shash.c -index ecb1e3d..3597545 100644 ---- a/crypto/shash.c -+++ b/crypto/shash.c -@@ -354,9 +354,10 @@ int crypto_init_shash_ops_async(struct crypto_tfm *tfm) - crt->final = shash_async_final; - crt->finup = shash_async_finup; - crt->digest = shash_async_digest; -+ crt->setkey = shash_async_setkey; -+ -+ crt->has_setkey = alg->setkey != shash_no_setkey; - -- if (alg->setkey) -- crt->setkey = shash_async_setkey; - if (alg->export) - crt->export = shash_async_export; - if (alg->import) -diff --git a/crypto/skcipher.c b/crypto/skcipher.c -index 7591928..d199c0b 100644 ---- a/crypto/skcipher.c -+++ b/crypto/skcipher.c -@@ -118,6 +118,7 @@ static int crypto_init_skcipher_ops_blkcipher(struct crypto_tfm *tfm) - skcipher->decrypt = skcipher_decrypt_blkcipher; - - skcipher->ivsize = crypto_blkcipher_ivsize(blkcipher); -+ skcipher->has_setkey = calg->cra_blkcipher.max_keysize; - - return 0; - } -@@ -210,6 +211,7 @@ static int crypto_init_skcipher_ops_ablkcipher(struct crypto_tfm *tfm) - skcipher->ivsize = crypto_ablkcipher_ivsize(ablkcipher); - skcipher->reqsize = crypto_ablkcipher_reqsize(ablkcipher) + - sizeof(struct ablkcipher_request); -+ skcipher->has_setkey = calg->cra_ablkcipher.max_keysize; - - return 0; - } -diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c -index cdfbcc5..99921aa 100644 ---- a/drivers/ata/ahci.c -+++ b/drivers/ata/ahci.c -@@ -264,6 +264,26 @@ static const struct pci_device_id ahci_pci_tbl[] = { - { PCI_VDEVICE(INTEL, 0x3b2b), board_ahci }, /* PCH RAID */ - { PCI_VDEVICE(INTEL, 0x3b2c), board_ahci }, /* PCH RAID */ - { PCI_VDEVICE(INTEL, 0x3b2f), board_ahci }, /* PCH AHCI */ -+ { PCI_VDEVICE(INTEL, 0x19b0), board_ahci }, /* DNV AHCI */ -+ { PCI_VDEVICE(INTEL, 0x19b1), board_ahci }, /* DNV AHCI */ -+ { PCI_VDEVICE(INTEL, 0x19b2), board_ahci }, /* DNV AHCI */ -+ { PCI_VDEVICE(INTEL, 0x19b3), board_ahci }, /* DNV AHCI */ -+ { PCI_VDEVICE(INTEL, 0x19b4), board_ahci }, /* DNV AHCI */ -+ { PCI_VDEVICE(INTEL, 0x19b5), board_ahci }, /* DNV AHCI */ -+ { PCI_VDEVICE(INTEL, 0x19b6), board_ahci }, /* DNV AHCI */ -+ { PCI_VDEVICE(INTEL, 0x19b7), board_ahci }, /* DNV AHCI */ -+ { PCI_VDEVICE(INTEL, 0x19bE), board_ahci }, /* DNV AHCI */ -+ { PCI_VDEVICE(INTEL, 0x19bF), board_ahci }, /* DNV AHCI */ -+ { PCI_VDEVICE(INTEL, 0x19c0), board_ahci }, /* DNV AHCI */ -+ { PCI_VDEVICE(INTEL, 0x19c1), board_ahci }, /* DNV AHCI */ -+ { PCI_VDEVICE(INTEL, 0x19c2), board_ahci }, /* DNV AHCI */ -+ { PCI_VDEVICE(INTEL, 0x19c3), board_ahci }, /* DNV AHCI */ -+ { PCI_VDEVICE(INTEL, 0x19c4), board_ahci }, /* DNV AHCI */ -+ { PCI_VDEVICE(INTEL, 0x19c5), board_ahci }, /* DNV AHCI */ -+ { PCI_VDEVICE(INTEL, 0x19c6), board_ahci }, /* DNV AHCI */ -+ { PCI_VDEVICE(INTEL, 0x19c7), board_ahci }, /* DNV AHCI */ -+ { PCI_VDEVICE(INTEL, 0x19cE), board_ahci }, /* DNV AHCI */ -+ { PCI_VDEVICE(INTEL, 0x19cF), board_ahci }, /* DNV AHCI */ - { PCI_VDEVICE(INTEL, 0x1c02), board_ahci }, /* CPT AHCI */ - { PCI_VDEVICE(INTEL, 0x1c03), board_ahci }, /* CPT AHCI */ - { PCI_VDEVICE(INTEL, 0x1c04), board_ahci }, /* CPT RAID */ -diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c -index 4665512..1f225cc 100644 ---- a/drivers/ata/libahci.c -+++ b/drivers/ata/libahci.c -@@ -495,8 +495,8 @@ void ahci_save_initial_config(struct device *dev, struct ahci_host_priv *hpriv) - } - } - -- /* fabricate port_map from cap.nr_ports */ -- if (!port_map) { -+ /* fabricate port_map from cap.nr_ports for < AHCI 1.3 */ -+ if (!port_map && vers < 0x10300) { - port_map = (1 << ahci_nr_ports(cap)) - 1; - dev_warn(dev, "forcing PORTS_IMPL to 0x%x\n", port_map); - -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) { -diff --git a/drivers/block/zram/zcomp.c b/drivers/block/zram/zcomp.c -index 5cb13ca..c536177 100644 ---- a/drivers/block/zram/zcomp.c -+++ b/drivers/block/zram/zcomp.c -@@ -76,7 +76,7 @@ static void zcomp_strm_free(struct zcomp *comp, struct zcomp_strm *zstrm) - */ - static struct zcomp_strm *zcomp_strm_alloc(struct zcomp *comp) - { -- struct zcomp_strm *zstrm = kmalloc(sizeof(*zstrm), GFP_KERNEL); -+ struct zcomp_strm *zstrm = kmalloc(sizeof(*zstrm), GFP_NOIO); - if (!zstrm) - return NULL; - -@@ -85,7 +85,7 @@ static struct zcomp_strm *zcomp_strm_alloc(struct zcomp *comp) - * allocate 2 pages. 1 for compressed data, plus 1 extra for the - * case when compressed size is larger than the original one - */ -- zstrm->buffer = (void *)__get_free_pages(GFP_KERNEL | __GFP_ZERO, 1); -+ zstrm->buffer = (void *)__get_free_pages(GFP_NOIO | __GFP_ZERO, 1); - if (!zstrm->private || !zstrm->buffer) { - zcomp_strm_free(comp, zstrm); - zstrm = NULL; -diff --git a/drivers/block/zram/zcomp_lz4.c b/drivers/block/zram/zcomp_lz4.c -index f2afb7e..dd60831 100644 ---- a/drivers/block/zram/zcomp_lz4.c -+++ b/drivers/block/zram/zcomp_lz4.c -@@ -10,17 +10,36 @@ - #include <linux/kernel.h> - #include <linux/slab.h> - #include <linux/lz4.h> -+#include <linux/vmalloc.h> -+#include <linux/mm.h> - - #include "zcomp_lz4.h" - - static void *zcomp_lz4_create(void) - { -- return kzalloc(LZ4_MEM_COMPRESS, GFP_KERNEL); -+ void *ret; -+ -+ /* -+ * This function can be called in swapout/fs write path -+ * so we can't use GFP_FS|IO. And it assumes we already -+ * have at least one stream in zram initialization so we -+ * don't do best effort to allocate more stream in here. -+ * A default stream will work well without further multiple -+ * streams. That's why we use NORETRY | NOWARN. -+ */ -+ ret = kzalloc(LZ4_MEM_COMPRESS, GFP_NOIO | __GFP_NORETRY | -+ __GFP_NOWARN); -+ if (!ret) -+ ret = __vmalloc(LZ4_MEM_COMPRESS, -+ GFP_NOIO | __GFP_NORETRY | __GFP_NOWARN | -+ __GFP_ZERO | __GFP_HIGHMEM, -+ PAGE_KERNEL); -+ return ret; - } - - static void zcomp_lz4_destroy(void *private) - { -- kfree(private); -+ kvfree(private); - } - - static int zcomp_lz4_compress(const unsigned char *src, unsigned char *dst, -diff --git a/drivers/block/zram/zcomp_lzo.c b/drivers/block/zram/zcomp_lzo.c -index da1bc47..edc5499 100644 ---- a/drivers/block/zram/zcomp_lzo.c -+++ b/drivers/block/zram/zcomp_lzo.c -@@ -10,17 +10,36 @@ - #include <linux/kernel.h> - #include <linux/slab.h> - #include <linux/lzo.h> -+#include <linux/vmalloc.h> -+#include <linux/mm.h> - - #include "zcomp_lzo.h" - - static void *lzo_create(void) - { -- return kzalloc(LZO1X_MEM_COMPRESS, GFP_KERNEL); -+ void *ret; -+ -+ /* -+ * This function can be called in swapout/fs write path -+ * so we can't use GFP_FS|IO. And it assumes we already -+ * have at least one stream in zram initialization so we -+ * don't do best effort to allocate more stream in here. -+ * A default stream will work well without further multiple -+ * streams. That's why we use NORETRY | NOWARN. -+ */ -+ ret = kzalloc(LZO1X_MEM_COMPRESS, GFP_NOIO | __GFP_NORETRY | -+ __GFP_NOWARN); -+ if (!ret) -+ ret = __vmalloc(LZO1X_MEM_COMPRESS, -+ GFP_NOIO | __GFP_NORETRY | __GFP_NOWARN | -+ __GFP_ZERO | __GFP_HIGHMEM, -+ PAGE_KERNEL); -+ return ret; - } - - static void lzo_destroy(void *private) - { -- kfree(private); -+ kvfree(private); - } - - static int lzo_compress(const unsigned char *src, unsigned char *dst, -diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c -index 47915d7..370c2f7 100644 ---- a/drivers/block/zram/zram_drv.c -+++ b/drivers/block/zram/zram_drv.c -@@ -1325,7 +1325,6 @@ static int zram_remove(struct zram *zram) - - pr_info("Removed device: %s\n", zram->disk->disk_name); - -- idr_remove(&zram_index_idr, zram->disk->first_minor); - blk_cleanup_queue(zram->disk->queue); - del_gendisk(zram->disk); - put_disk(zram->disk); -@@ -1367,10 +1366,12 @@ static ssize_t hot_remove_store(struct class *class, - mutex_lock(&zram_index_mutex); - - zram = idr_find(&zram_index_idr, dev_id); -- if (zram) -+ if (zram) { - ret = zram_remove(zram); -- else -+ idr_remove(&zram_index_idr, dev_id); -+ } else { - ret = -ENODEV; -+ } - - mutex_unlock(&zram_index_mutex); - return ret ? ret : count; -diff --git a/drivers/crypto/atmel-sha.c b/drivers/crypto/atmel-sha.c -index 660d8c0..3178f84 100644 ---- a/drivers/crypto/atmel-sha.c -+++ b/drivers/crypto/atmel-sha.c -@@ -783,7 +783,7 @@ static void atmel_sha_finish_req(struct ahash_request *req, int err) - dd->flags &= ~(SHA_FLAGS_BUSY | SHA_FLAGS_FINAL | SHA_FLAGS_CPU | - SHA_FLAGS_DMA_READY | SHA_FLAGS_OUTPUT_READY); - -- clk_disable_unprepare(dd->iclk); -+ clk_disable(dd->iclk); - - if (req->base.complete) - req->base.complete(&req->base, err); -@@ -796,7 +796,7 @@ static int atmel_sha_hw_init(struct atmel_sha_dev *dd) - { - int err; - -- err = clk_prepare_enable(dd->iclk); -+ err = clk_enable(dd->iclk); - if (err) - return err; - -@@ -823,7 +823,7 @@ static void atmel_sha_hw_version_init(struct atmel_sha_dev *dd) - dev_info(dd->dev, - "version: 0x%x\n", dd->hw_version); - -- clk_disable_unprepare(dd->iclk); -+ clk_disable(dd->iclk); - } - - static int atmel_sha_handle_queue(struct atmel_sha_dev *dd, -@@ -1411,6 +1411,10 @@ static int atmel_sha_probe(struct platform_device *pdev) - goto res_err; - } - -+ err = clk_prepare(sha_dd->iclk); -+ if (err) -+ goto res_err; -+ - atmel_sha_hw_version_init(sha_dd); - - atmel_sha_get_cap(sha_dd); -@@ -1422,12 +1426,12 @@ static int atmel_sha_probe(struct platform_device *pdev) - if (IS_ERR(pdata)) { - dev_err(&pdev->dev, "platform data not available\n"); - err = PTR_ERR(pdata); -- goto res_err; -+ goto iclk_unprepare; - } - } - if (!pdata->dma_slave) { - err = -ENXIO; -- goto res_err; -+ goto iclk_unprepare; - } - err = atmel_sha_dma_init(sha_dd, pdata); - if (err) -@@ -1458,6 +1462,8 @@ err_algs: - if (sha_dd->caps.has_dma) - atmel_sha_dma_cleanup(sha_dd); - err_sha_dma: -+iclk_unprepare: -+ clk_unprepare(sha_dd->iclk); - res_err: - tasklet_kill(&sha_dd->done_task); - sha_dd_err: -@@ -1484,12 +1490,7 @@ static int atmel_sha_remove(struct platform_device *pdev) - if (sha_dd->caps.has_dma) - atmel_sha_dma_cleanup(sha_dd); - -- iounmap(sha_dd->io_base); -- -- clk_put(sha_dd->iclk); -- -- if (sha_dd->irq >= 0) -- free_irq(sha_dd->irq, sha_dd); -+ clk_unprepare(sha_dd->iclk); - - return 0; - } -diff --git a/drivers/crypto/caam/ctrl.c b/drivers/crypto/caam/ctrl.c -index 8abb4bc..69d4a13 100644 ---- a/drivers/crypto/caam/ctrl.c -+++ b/drivers/crypto/caam/ctrl.c -@@ -534,8 +534,8 @@ static int caam_probe(struct platform_device *pdev) - * long pointers in master configuration register - */ - clrsetbits_32(&ctrl->mcr, MCFGR_AWCACHE_MASK, MCFGR_AWCACHE_CACH | -- MCFGR_WDENABLE | (sizeof(dma_addr_t) == sizeof(u64) ? -- MCFGR_LONG_PTR : 0)); -+ MCFGR_AWCACHE_BUFF | MCFGR_WDENABLE | -+ (sizeof(dma_addr_t) == sizeof(u64) ? MCFGR_LONG_PTR : 0)); - - /* - * Read the Compile Time paramters and SCFGR to determine -diff --git a/drivers/crypto/marvell/cesa.c b/drivers/crypto/marvell/cesa.c -index 0643e33..c0656e7 100644 ---- a/drivers/crypto/marvell/cesa.c -+++ b/drivers/crypto/marvell/cesa.c -@@ -306,7 +306,7 @@ static int mv_cesa_dev_dma_init(struct mv_cesa_dev *cesa) - return -ENOMEM; - - dma->padding_pool = dmam_pool_create("cesa_padding", dev, 72, 1, 0); -- if (!dma->cache_pool) -+ if (!dma->padding_pool) - return -ENOMEM; - - cesa->dma = dma; -diff --git a/drivers/crypto/sunxi-ss/sun4i-ss-core.c b/drivers/crypto/sunxi-ss/sun4i-ss-core.c -index eab6fe2..107cd2a 100644 ---- a/drivers/crypto/sunxi-ss/sun4i-ss-core.c -+++ b/drivers/crypto/sunxi-ss/sun4i-ss-core.c -@@ -39,6 +39,7 @@ static struct sun4i_ss_alg_template ss_algs[] = { - .import = sun4i_hash_import_md5, - .halg = { - .digestsize = MD5_DIGEST_SIZE, -+ .statesize = sizeof(struct md5_state), - .base = { - .cra_name = "md5", - .cra_driver_name = "md5-sun4i-ss", -@@ -66,6 +67,7 @@ static struct sun4i_ss_alg_template ss_algs[] = { - .import = sun4i_hash_import_sha1, - .halg = { - .digestsize = SHA1_DIGEST_SIZE, -+ .statesize = sizeof(struct sha1_state), - .base = { - .cra_name = "sha1", - .cra_driver_name = "sha1-sun4i-ss", -diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c -index 3d664d0..2b8ff18 100644 ---- a/drivers/hid/hid-multitouch.c -+++ b/drivers/hid/hid-multitouch.c -@@ -357,8 +357,19 @@ static void mt_feature_mapping(struct hid_device *hdev, - break; - } - -- td->inputmode = field->report->id; -- td->inputmode_index = usage->usage_index; -+ if (td->inputmode < 0) { -+ td->inputmode = field->report->id; -+ td->inputmode_index = usage->usage_index; -+ } else { -+ /* -+ * Some elan panels wrongly declare 2 input mode -+ * features, and silently ignore when we set the -+ * value in the second field. Skip the second feature -+ * and hope for the best. -+ */ -+ dev_info(&hdev->dev, -+ "Ignoring the extra HID_DG_INPUTMODE\n"); -+ } - - break; - case HID_DG_CONTACTMAX: -diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c -index 36712e9..5dd426f 100644 ---- a/drivers/hid/usbhid/hid-core.c -+++ b/drivers/hid/usbhid/hid-core.c -@@ -477,8 +477,6 @@ static void hid_ctrl(struct urb *urb) - struct usbhid_device *usbhid = hid->driver_data; - int unplug = 0, status = urb->status; - -- spin_lock(&usbhid->lock); -- - switch (status) { - case 0: /* success */ - if (usbhid->ctrl[usbhid->ctrltail].dir == USB_DIR_IN) -@@ -498,6 +496,8 @@ static void hid_ctrl(struct urb *urb) - hid_warn(urb->dev, "ctrl urb status %d received\n", status); - } - -+ spin_lock(&usbhid->lock); -+ - if (unplug) { - usbhid->ctrltail = usbhid->ctrlhead; - } else { -diff --git a/drivers/iommu/io-pgtable-arm.c b/drivers/iommu/io-pgtable-arm.c -index 7df9777..dad768c 100644 ---- a/drivers/iommu/io-pgtable-arm.c -+++ b/drivers/iommu/io-pgtable-arm.c -@@ -405,17 +405,18 @@ static void __arm_lpae_free_pgtable(struct arm_lpae_io_pgtable *data, int lvl, - arm_lpae_iopte *start, *end; - unsigned long table_size; - -- /* Only leaf entries at the last level */ -- if (lvl == ARM_LPAE_MAX_LEVELS - 1) -- return; -- - if (lvl == ARM_LPAE_START_LVL(data)) - table_size = data->pgd_size; - else - table_size = 1UL << data->pg_shift; - - start = ptep; -- end = (void *)ptep + table_size; -+ -+ /* Only leaf entries at the last level */ -+ if (lvl == ARM_LPAE_MAX_LEVELS - 1) -+ end = ptep; -+ else -+ end = (void *)ptep + table_size; - - while (ptep != end) { - arm_lpae_iopte pte = *ptep++; -diff --git a/drivers/md/md.c b/drivers/md/md.c -index 61aacab..b1e1f6b 100644 ---- a/drivers/md/md.c -+++ b/drivers/md/md.c -@@ -2017,28 +2017,32 @@ int md_integrity_register(struct mddev *mddev) - } - EXPORT_SYMBOL(md_integrity_register); - --/* Disable data integrity if non-capable/non-matching disk is being added */ --void md_integrity_add_rdev(struct md_rdev *rdev, struct mddev *mddev) -+/* -+ * Attempt to add an rdev, but only if it is consistent with the current -+ * integrity profile -+ */ -+int md_integrity_add_rdev(struct md_rdev *rdev, struct mddev *mddev) - { - struct blk_integrity *bi_rdev; - struct blk_integrity *bi_mddev; -+ char name[BDEVNAME_SIZE]; - - if (!mddev->gendisk) -- return; -+ return 0; - - bi_rdev = bdev_get_integrity(rdev->bdev); - bi_mddev = blk_get_integrity(mddev->gendisk); - - if (!bi_mddev) /* nothing to do */ -- return; -- if (rdev->raid_disk < 0) /* skip spares */ -- return; -- if (bi_rdev && blk_integrity_compare(mddev->gendisk, -- rdev->bdev->bd_disk) >= 0) -- return; -- WARN_ON_ONCE(!mddev->suspended); -- printk(KERN_NOTICE "disabling data integrity on %s\n", mdname(mddev)); -- blk_integrity_unregister(mddev->gendisk); -+ return 0; -+ -+ if (blk_integrity_compare(mddev->gendisk, rdev->bdev->bd_disk) != 0) { -+ printk(KERN_NOTICE "%s: incompatible integrity profile for %s\n", -+ mdname(mddev), bdevname(rdev->bdev, name)); -+ return -ENXIO; -+ } -+ -+ return 0; - } - EXPORT_SYMBOL(md_integrity_add_rdev); - -diff --git a/drivers/md/md.h b/drivers/md/md.h -index ca0b643..dfa57b4 100644 ---- a/drivers/md/md.h -+++ b/drivers/md/md.h -@@ -657,7 +657,7 @@ extern void md_wait_for_blocked_rdev(struct md_rdev *rdev, struct mddev *mddev); - extern void md_set_array_sectors(struct mddev *mddev, sector_t array_sectors); - extern int md_check_no_bitmap(struct mddev *mddev); - extern int md_integrity_register(struct mddev *mddev); --extern void md_integrity_add_rdev(struct md_rdev *rdev, struct mddev *mddev); -+extern int md_integrity_add_rdev(struct md_rdev *rdev, struct mddev *mddev); - extern int strict_strtoul_scaled(const char *cp, unsigned long *res, int scale); - - extern void mddev_init(struct mddev *mddev); -diff --git a/drivers/md/multipath.c b/drivers/md/multipath.c -index 7331a80..0a72ab6 100644 ---- a/drivers/md/multipath.c -+++ b/drivers/md/multipath.c -@@ -257,6 +257,9 @@ static int multipath_add_disk(struct mddev *mddev, struct md_rdev *rdev) - disk_stack_limits(mddev->gendisk, rdev->bdev, - rdev->data_offset << 9); - -+ err = md_integrity_add_rdev(rdev, mddev); -+ if (err) -+ break; - spin_lock_irq(&conf->device_lock); - mddev->degraded--; - rdev->raid_disk = path; -@@ -264,9 +267,6 @@ static int multipath_add_disk(struct mddev *mddev, struct md_rdev *rdev) - spin_unlock_irq(&conf->device_lock); - rcu_assign_pointer(p->rdev, rdev); - err = 0; -- mddev_suspend(mddev); -- md_integrity_add_rdev(rdev, mddev); -- mddev_resume(mddev); - break; - } - -diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c -index e2169ff..c4b9134 100644 ---- a/drivers/md/raid1.c -+++ b/drivers/md/raid1.c -@@ -1589,6 +1589,9 @@ static int raid1_add_disk(struct mddev *mddev, struct md_rdev *rdev) - if (mddev->recovery_disabled == conf->recovery_disabled) - return -EBUSY; - -+ if (md_integrity_add_rdev(rdev, mddev)) -+ return -ENXIO; -+ - if (rdev->raid_disk >= 0) - first = last = rdev->raid_disk; - -@@ -1632,9 +1635,6 @@ static int raid1_add_disk(struct mddev *mddev, struct md_rdev *rdev) - break; - } - } -- mddev_suspend(mddev); -- md_integrity_add_rdev(rdev, mddev); -- mddev_resume(mddev); - if (mddev->queue && blk_queue_discard(bdev_get_queue(rdev->bdev))) - queue_flag_set_unlocked(QUEUE_FLAG_DISCARD, mddev->queue); - print_conf(conf); -diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c -index 84e597e..ce959b4 100644 ---- a/drivers/md/raid10.c -+++ b/drivers/md/raid10.c -@@ -1698,6 +1698,9 @@ static int raid10_add_disk(struct mddev *mddev, struct md_rdev *rdev) - if (rdev->saved_raid_disk < 0 && !_enough(conf, 1, -1)) - return -EINVAL; - -+ if (md_integrity_add_rdev(rdev, mddev)) -+ return -ENXIO; -+ - if (rdev->raid_disk >= 0) - first = last = rdev->raid_disk; - -@@ -1739,9 +1742,6 @@ static int raid10_add_disk(struct mddev *mddev, struct md_rdev *rdev) - rcu_assign_pointer(p->rdev, rdev); - break; - } -- mddev_suspend(mddev); -- md_integrity_add_rdev(rdev, mddev); -- mddev_resume(mddev); - if (mddev->queue && blk_queue_discard(bdev_get_queue(rdev->bdev))) - queue_flag_set_unlocked(QUEUE_FLAG_DISCARD, mddev->queue); - -diff --git a/drivers/media/i2c/ir-kbd-i2c.c b/drivers/media/i2c/ir-kbd-i2c.c -index 728d2cc..175a761 100644 ---- a/drivers/media/i2c/ir-kbd-i2c.c -+++ b/drivers/media/i2c/ir-kbd-i2c.c -@@ -478,7 +478,6 @@ static const struct i2c_device_id ir_kbd_id[] = { - { "ir_rx_z8f0811_hdpvr", 0 }, - { } - }; --MODULE_DEVICE_TABLE(i2c, ir_kbd_id); - - static struct i2c_driver ir_kbd_driver = { - .driver = { -diff --git a/drivers/media/pci/saa7134/saa7134-alsa.c b/drivers/media/pci/saa7134/saa7134-alsa.c -index 1d2c310..94f8162 100644 ---- a/drivers/media/pci/saa7134/saa7134-alsa.c -+++ b/drivers/media/pci/saa7134/saa7134-alsa.c -@@ -1211,6 +1211,8 @@ static int alsa_device_init(struct saa7134_dev *dev) - - static int alsa_device_exit(struct saa7134_dev *dev) - { -+ if (!snd_saa7134_cards[dev->nr]) -+ return 1; - - snd_card_free(snd_saa7134_cards[dev->nr]); - snd_saa7134_cards[dev->nr] = NULL; -@@ -1260,7 +1262,8 @@ static void saa7134_alsa_exit(void) - int idx; - - for (idx = 0; idx < SNDRV_CARDS; idx++) { -- snd_card_free(snd_saa7134_cards[idx]); -+ if (snd_saa7134_cards[idx]) -+ snd_card_free(snd_saa7134_cards[idx]); - } - - saa7134_dmasound_init = NULL; -diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c -index ece544e..3ff583f 100644 ---- a/drivers/mtd/nand/nand_base.c -+++ b/drivers/mtd/nand/nand_base.c -@@ -3995,6 +3995,9 @@ int nand_scan_ident(struct mtd_info *mtd, int maxchips, - return ret; - } - -+ if (!mtd->name && mtd->dev.parent) -+ mtd->name = dev_name(mtd->dev.parent); -+ - /* Set the default functions */ - nand_set_defaults(chip, chip->options & NAND_BUSWIDTH_16); - -diff --git a/drivers/net/wireless/realtek/rtlwifi/regd.c b/drivers/net/wireless/realtek/rtlwifi/regd.c -index a62bf0a..5be3411 100644 ---- a/drivers/net/wireless/realtek/rtlwifi/regd.c -+++ b/drivers/net/wireless/realtek/rtlwifi/regd.c -@@ -351,7 +351,6 @@ static const struct ieee80211_regdomain *_rtl_regdomain_select( - case COUNTRY_CODE_SPAIN: - case COUNTRY_CODE_FRANCE: - case COUNTRY_CODE_ISRAEL: -- case COUNTRY_CODE_WORLD_WIDE_13: - return &rtl_regdom_12_13; - case COUNTRY_CODE_MKK: - case COUNTRY_CODE_MKK1: -@@ -360,6 +359,7 @@ static const struct ieee80211_regdomain *_rtl_regdomain_select( - return &rtl_regdom_14_60_64; - case COUNTRY_CODE_GLOBAL_DOMAIN: - return &rtl_regdom_14; -+ case COUNTRY_CODE_WORLD_WIDE_13: - case COUNTRY_CODE_WORLD_WIDE_13_5G_ALL: - return &rtl_regdom_12_13_5g_all; - default: -diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.c -index 142bdff..4159f9b 100644 ---- a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.c -+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.c -@@ -95,8 +95,6 @@ int rtl8821ae_init_sw_vars(struct ieee80211_hw *hw) - struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw)); - - rtl8821ae_bt_reg_init(hw); -- rtlpci->msi_support = rtlpriv->cfg->mod_params->msi_support; -- rtlpci->int_clear = rtlpriv->cfg->mod_params->int_clear; - rtlpriv->btcoexist.btc_ops = rtl_btc_get_ops_pointer(); - - rtlpriv->dm.dm_initialgain_enable = 1; -@@ -168,12 +166,15 @@ int rtl8821ae_init_sw_vars(struct ieee80211_hw *hw) - rtlpriv->psc.swctrl_lps = rtlpriv->cfg->mod_params->swctrl_lps; - rtlpriv->psc.fwctrl_lps = rtlpriv->cfg->mod_params->fwctrl_lps; - rtlpci->msi_support = rtlpriv->cfg->mod_params->msi_support; -- rtlpci->msi_support = rtlpriv->cfg->mod_params->int_clear; -+ rtlpci->int_clear = rtlpriv->cfg->mod_params->int_clear; -+ rtlpriv->cfg->mod_params->sw_crypto = -+ rtlpriv->cfg->mod_params->sw_crypto; -+ rtlpriv->cfg->mod_params->disable_watchdog = -+ rtlpriv->cfg->mod_params->disable_watchdog; - if (rtlpriv->cfg->mod_params->disable_watchdog) - pr_info("watchdog disabled\n"); - rtlpriv->psc.reg_fwctrl_lps = 3; - rtlpriv->psc.reg_max_lps_awakeintvl = 5; -- rtlpci->msi_support = rtlpriv->cfg->mod_params->msi_support; - - /* for ASPM, you can close aspm through - * set const_support_pciaspm = 0 -diff --git a/drivers/net/wireless/ti/wlcore/io.h b/drivers/net/wireless/ti/wlcore/io.h -index 0305729..10cf374 100644 ---- a/drivers/net/wireless/ti/wlcore/io.h -+++ b/drivers/net/wireless/ti/wlcore/io.h -@@ -207,19 +207,23 @@ static inline int __must_check wlcore_write_reg(struct wl1271 *wl, int reg, - - static inline void wl1271_power_off(struct wl1271 *wl) - { -- int ret; -+ int ret = 0; - - if (!test_bit(WL1271_FLAG_GPIO_POWER, &wl->flags)) - return; - -- ret = wl->if_ops->power(wl->dev, false); -+ if (wl->if_ops->power) -+ ret = wl->if_ops->power(wl->dev, false); - if (!ret) - clear_bit(WL1271_FLAG_GPIO_POWER, &wl->flags); - } - - static inline int wl1271_power_on(struct wl1271 *wl) - { -- int ret = wl->if_ops->power(wl->dev, true); -+ int ret = 0; -+ -+ if (wl->if_ops->power) -+ ret = wl->if_ops->power(wl->dev, true); - if (ret == 0) - set_bit(WL1271_FLAG_GPIO_POWER, &wl->flags); - -diff --git a/drivers/net/wireless/ti/wlcore/spi.c b/drivers/net/wireless/ti/wlcore/spi.c -index 236b410..44f059f7 100644 ---- a/drivers/net/wireless/ti/wlcore/spi.c -+++ b/drivers/net/wireless/ti/wlcore/spi.c -@@ -73,7 +73,10 @@ - */ - #define SPI_AGGR_BUFFER_SIZE (4 * PAGE_SIZE) - --#define WSPI_MAX_NUM_OF_CHUNKS (SPI_AGGR_BUFFER_SIZE / WSPI_MAX_CHUNK_SIZE) -+/* Maximum number of SPI write chunks */ -+#define WSPI_MAX_NUM_OF_CHUNKS \ -+ ((SPI_AGGR_BUFFER_SIZE / WSPI_MAX_CHUNK_SIZE) + 1) -+ - - struct wl12xx_spi_glue { - struct device *dev; -@@ -268,9 +271,10 @@ static int __must_check wl12xx_spi_raw_write(struct device *child, int addr, - void *buf, size_t len, bool fixed) - { - struct wl12xx_spi_glue *glue = dev_get_drvdata(child->parent); -- struct spi_transfer t[2 * (WSPI_MAX_NUM_OF_CHUNKS + 1)]; -+ /* SPI write buffers - 2 for each chunk */ -+ struct spi_transfer t[2 * WSPI_MAX_NUM_OF_CHUNKS]; - struct spi_message m; -- u32 commands[WSPI_MAX_NUM_OF_CHUNKS]; -+ u32 commands[WSPI_MAX_NUM_OF_CHUNKS]; /* 1 command per chunk */ - u32 *cmd; - u32 chunk_len; - int i; -diff --git a/drivers/pci/bus.c b/drivers/pci/bus.c -index d3346d2..89b3bef 100644 ---- a/drivers/pci/bus.c -+++ b/drivers/pci/bus.c -@@ -140,6 +140,8 @@ static int pci_bus_alloc_from_region(struct pci_bus *bus, struct resource *res, - type_mask |= IORESOURCE_TYPE_BITS; - - pci_bus_for_each_resource(bus, r, i) { -+ resource_size_t min_used = min; -+ - if (!r) - continue; - -@@ -163,12 +165,12 @@ static int pci_bus_alloc_from_region(struct pci_bus *bus, struct resource *res, - * overrides "min". - */ - if (avail.start) -- min = avail.start; -+ min_used = avail.start; - - max = avail.end; - - /* Ok, try it out.. */ -- ret = allocate_resource(r, res, size, min, max, -+ ret = allocate_resource(r, res, size, min_used, max, - align, alignf, alignf_data); - if (ret == 0) - return 0; -diff --git a/drivers/pci/host/pci-dra7xx.c b/drivers/pci/host/pci-dra7xx.c -index 8c36880..923607b 100644 ---- a/drivers/pci/host/pci-dra7xx.c -+++ b/drivers/pci/host/pci-dra7xx.c -@@ -302,7 +302,8 @@ static int __init dra7xx_add_pcie_port(struct dra7xx_pcie *dra7xx, - } - - ret = devm_request_irq(&pdev->dev, pp->irq, -- dra7xx_pcie_msi_irq_handler, IRQF_SHARED, -+ dra7xx_pcie_msi_irq_handler, -+ IRQF_SHARED | IRQF_NO_THREAD, - "dra7-pcie-msi", pp); - if (ret) { - dev_err(&pdev->dev, "failed to request irq\n"); -diff --git a/drivers/pci/host/pci-exynos.c b/drivers/pci/host/pci-exynos.c -index 01095e1..d997d22 100644 ---- a/drivers/pci/host/pci-exynos.c -+++ b/drivers/pci/host/pci-exynos.c -@@ -522,7 +522,8 @@ static int __init exynos_add_pcie_port(struct pcie_port *pp, - - ret = devm_request_irq(&pdev->dev, pp->msi_irq, - exynos_pcie_msi_irq_handler, -- IRQF_SHARED, "exynos-pcie", pp); -+ IRQF_SHARED | IRQF_NO_THREAD, -+ "exynos-pcie", pp); - if (ret) { - dev_err(&pdev->dev, "failed to request msi irq\n"); - return ret; -diff --git a/drivers/pci/host/pci-imx6.c b/drivers/pci/host/pci-imx6.c -index 22e8224..9ce7cd1 100644 ---- a/drivers/pci/host/pci-imx6.c -+++ b/drivers/pci/host/pci-imx6.c -@@ -537,7 +537,8 @@ static int __init imx6_add_pcie_port(struct pcie_port *pp, - - ret = devm_request_irq(&pdev->dev, pp->msi_irq, - imx6_pcie_msi_handler, -- IRQF_SHARED, "mx6-pcie-msi", pp); -+ IRQF_SHARED | IRQF_NO_THREAD, -+ "mx6-pcie-msi", pp); - if (ret) { - dev_err(&pdev->dev, "failed to request MSI irq\n"); - return ret; -diff --git a/drivers/pci/host/pci-tegra.c b/drivers/pci/host/pci-tegra.c -index 3018ae5..3032311 100644 ---- a/drivers/pci/host/pci-tegra.c -+++ b/drivers/pci/host/pci-tegra.c -@@ -1288,7 +1288,7 @@ static int tegra_pcie_enable_msi(struct tegra_pcie *pcie) - - msi->irq = err; - -- err = request_irq(msi->irq, tegra_pcie_msi_irq, 0, -+ err = request_irq(msi->irq, tegra_pcie_msi_irq, IRQF_NO_THREAD, - tegra_msi_irq_chip.name, pcie); - if (err < 0) { - dev_err(&pdev->dev, "failed to request IRQ: %d\n", err); -diff --git a/drivers/pci/host/pcie-rcar.c b/drivers/pci/host/pcie-rcar.c -index f4fa6c5..414c336 100644 ---- a/drivers/pci/host/pcie-rcar.c -+++ b/drivers/pci/host/pcie-rcar.c -@@ -720,14 +720,16 @@ static int rcar_pcie_enable_msi(struct rcar_pcie *pcie) - - /* Two irqs are for MSI, but they are also used for non-MSI irqs */ - err = devm_request_irq(&pdev->dev, msi->irq1, rcar_pcie_msi_irq, -- IRQF_SHARED, rcar_msi_irq_chip.name, pcie); -+ IRQF_SHARED | IRQF_NO_THREAD, -+ rcar_msi_irq_chip.name, pcie); - if (err < 0) { - dev_err(&pdev->dev, "failed to request IRQ: %d\n", err); - goto err; - } - - err = devm_request_irq(&pdev->dev, msi->irq2, rcar_pcie_msi_irq, -- IRQF_SHARED, rcar_msi_irq_chip.name, pcie); -+ IRQF_SHARED | IRQF_NO_THREAD, -+ rcar_msi_irq_chip.name, pcie); - if (err < 0) { - dev_err(&pdev->dev, "failed to request IRQ: %d\n", err); - goto err; -diff --git a/drivers/pci/host/pcie-spear13xx.c b/drivers/pci/host/pcie-spear13xx.c -index b95b756..a6cd823 100644 ---- a/drivers/pci/host/pcie-spear13xx.c -+++ b/drivers/pci/host/pcie-spear13xx.c -@@ -279,7 +279,8 @@ static int spear13xx_add_pcie_port(struct pcie_port *pp, - return -ENODEV; - } - ret = devm_request_irq(dev, pp->irq, spear13xx_pcie_irq_handler, -- IRQF_SHARED, "spear1340-pcie", pp); -+ IRQF_SHARED | IRQF_NO_THREAD, -+ "spear1340-pcie", pp); - if (ret) { - dev_err(dev, "failed to request irq %d\n", pp->irq); - return ret; -diff --git a/drivers/pci/host/pcie-xilinx.c b/drivers/pci/host/pcie-xilinx.c -index 3c7a0d5..4cfa463 100644 ---- a/drivers/pci/host/pcie-xilinx.c -+++ b/drivers/pci/host/pcie-xilinx.c -@@ -781,7 +781,8 @@ static int xilinx_pcie_parse_dt(struct xilinx_pcie_port *port) - - port->irq = irq_of_parse_and_map(node, 0); - err = devm_request_irq(dev, port->irq, xilinx_pcie_intr_handler, -- IRQF_SHARED, "xilinx-pcie", port); -+ IRQF_SHARED | IRQF_NO_THREAD, -+ "xilinx-pcie", port); - if (err) { - dev_err(dev, "unable to request irq %d\n", port->irq); - return err; -diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c -index e49c2bce..cf000b3 100644 ---- a/drivers/tty/n_tty.c -+++ b/drivers/tty/n_tty.c -@@ -258,16 +258,13 @@ static void n_tty_check_throttle(struct tty_struct *tty) - - static void n_tty_check_unthrottle(struct tty_struct *tty) - { -- if (tty->driver->type == TTY_DRIVER_TYPE_PTY && -- tty->link->ldisc->ops->write_wakeup == n_tty_write_wakeup) { -+ if (tty->driver->type == TTY_DRIVER_TYPE_PTY) { - if (chars_in_buffer(tty) > TTY_THRESHOLD_UNTHROTTLE) - return; - if (!tty->count) - return; - n_tty_kick_worker(tty); -- n_tty_write_wakeup(tty->link); -- if (waitqueue_active(&tty->link->write_wait)) -- wake_up_interruptible_poll(&tty->link->write_wait, POLLOUT); -+ tty_wakeup(tty->link); - return; - } - -diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c -index bcc8e1e..7cef543 100644 ---- a/drivers/tty/tty_io.c -+++ b/drivers/tty/tty_io.c -@@ -1462,13 +1462,13 @@ static int tty_reopen(struct tty_struct *tty) - { - struct tty_driver *driver = tty->driver; - -- if (!tty->count) -- return -EIO; -- - if (driver->type == TTY_DRIVER_TYPE_PTY && - driver->subtype == PTY_TYPE_MASTER) - return -EIO; - -+ if (!tty->count) -+ return -EAGAIN; -+ - if (test_bit(TTY_EXCLUSIVE, &tty->flags) && !capable(CAP_SYS_ADMIN)) - return -EBUSY; - -@@ -2069,7 +2069,12 @@ retry_open: - - if (tty) { - mutex_unlock(&tty_mutex); -- tty_lock(tty); -+ retval = tty_lock_interruptible(tty); -+ if (retval) { -+ if (retval == -EINTR) -+ retval = -ERESTARTSYS; -+ goto err_unref; -+ } - /* safe to drop the kref from tty_driver_lookup_tty() */ - tty_kref_put(tty); - retval = tty_reopen(tty); -@@ -2087,7 +2092,11 @@ retry_open: - - if (IS_ERR(tty)) { - retval = PTR_ERR(tty); -- goto err_file; -+ if (retval != -EAGAIN || signal_pending(current)) -+ goto err_file; -+ tty_free_file(filp); -+ schedule(); -+ goto retry_open; - } - - tty_add_file(tty, filp); -@@ -2156,6 +2165,7 @@ retry_open: - return 0; - err_unlock: - mutex_unlock(&tty_mutex); -+err_unref: - /* after locks to avoid deadlock */ - if (!IS_ERR_OR_NULL(driver)) - tty_driver_kref_put(driver); -@@ -2653,6 +2663,28 @@ static int tiocsetd(struct tty_struct *tty, int __user *p) - } - - /** -+ * tiocgetd - get line discipline -+ * @tty: tty device -+ * @p: pointer to user data -+ * -+ * Retrieves the line discipline id directly from the ldisc. -+ * -+ * Locking: waits for ldisc reference (in case the line discipline -+ * is changing or the tty is being hungup) -+ */ -+ -+static int tiocgetd(struct tty_struct *tty, int __user *p) -+{ -+ struct tty_ldisc *ld; -+ int ret; -+ -+ ld = tty_ldisc_ref_wait(tty); -+ ret = put_user(ld->ops->num, p); -+ tty_ldisc_deref(ld); -+ return ret; -+} -+ -+/** - * send_break - performed time break - * @tty: device to break on - * @duration: timeout in mS -@@ -2878,7 +2910,7 @@ long tty_ioctl(struct file *file, unsigned int cmd, unsigned long arg) - case TIOCGSID: - return tiocgsid(tty, real_tty, p); - case TIOCGETD: -- return put_user(tty->ldisc->ops->num, (int __user *)p); -+ return tiocgetd(tty, p); - case TIOCSETD: - return tiocsetd(tty, p); - case TIOCVHANGUP: -diff --git a/drivers/tty/tty_mutex.c b/drivers/tty/tty_mutex.c -index 0efcf71..d09293b 100644 ---- a/drivers/tty/tty_mutex.c -+++ b/drivers/tty/tty_mutex.c -@@ -22,6 +22,14 @@ void __lockfunc tty_lock(struct tty_struct *tty) - } - EXPORT_SYMBOL(tty_lock); - -+int tty_lock_interruptible(struct tty_struct *tty) -+{ -+ if (WARN(tty->magic != TTY_MAGIC, "L Bad %p\n", tty)) -+ return -EIO; -+ tty_kref_get(tty); -+ return mutex_lock_interruptible(&tty->legacy_mutex); -+} -+ - void __lockfunc tty_unlock(struct tty_struct *tty) - { - if (tty->magic != TTY_MAGIC) { -diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c -index 26ca4f9..e4c70dc 100644 ---- a/drivers/usb/class/cdc-acm.c -+++ b/drivers/usb/class/cdc-acm.c -@@ -428,7 +428,8 @@ static void acm_read_bulk_callback(struct urb *urb) - set_bit(rb->index, &acm->read_urbs_free); - dev_dbg(&acm->data->dev, "%s - non-zero urb status: %d\n", - __func__, status); -- return; -+ if ((status != -ENOENT) || (urb->actual_length == 0)) -+ return; - } - - usb_mark_last_busy(acm->dev); -@@ -1404,6 +1405,8 @@ made_compressed_probe: - usb_sndbulkpipe(usb_dev, epwrite->bEndpointAddress), - NULL, acm->writesize, acm_write_bulk, snd); - snd->urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP; -+ if (quirks & SEND_ZERO_PACKET) -+ snd->urb->transfer_flags |= URB_ZERO_PACKET; - snd->instance = acm; - } - -@@ -1861,6 +1864,10 @@ static const struct usb_device_id acm_ids[] = { - { USB_INTERFACE_INFO(USB_CLASS_COMM, USB_CDC_SUBCLASS_ACM, - USB_CDC_ACM_PROTO_AT_CDMA) }, - -+ { USB_DEVICE(0x1519, 0x0452), /* Intel 7260 modem */ -+ .driver_info = SEND_ZERO_PACKET, -+ }, -+ - { } - }; - -diff --git a/drivers/usb/class/cdc-acm.h b/drivers/usb/class/cdc-acm.h -index dd9af38..ccfaba9 100644 ---- a/drivers/usb/class/cdc-acm.h -+++ b/drivers/usb/class/cdc-acm.h -@@ -134,3 +134,4 @@ struct acm { - #define IGNORE_DEVICE BIT(5) - #define QUIRK_CONTROL_LINE_STATE BIT(6) - #define CLEAR_HALT_CONDITIONS BIT(7) -+#define SEND_ZERO_PACKET BIT(8) -diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c -index 8683436..1560f3f 100644 ---- a/drivers/usb/core/hub.c -+++ b/drivers/usb/core/hub.c -@@ -5386,7 +5386,6 @@ static int usb_reset_and_verify_device(struct usb_device *udev) - } - - bos = udev->bos; -- udev->bos = NULL; - - for (i = 0; i < SET_CONFIG_TRIES; ++i) { - -@@ -5479,8 +5478,11 @@ done: - usb_set_usb2_hardware_lpm(udev, 1); - usb_unlocked_enable_lpm(udev); - usb_enable_ltm(udev); -- usb_release_bos_descriptor(udev); -- udev->bos = bos; -+ /* release the new BOS descriptor allocated by hub_port_init() */ -+ if (udev->bos != bos) { -+ usb_release_bos_descriptor(udev); -+ udev->bos = bos; -+ } - return 0; - - re_enumerate: -diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c -index c621090..c2d6520 100644 ---- a/drivers/usb/host/xhci-pci.c -+++ b/drivers/usb/host/xhci-pci.c -@@ -28,7 +28,9 @@ - #include "xhci.h" - #include "xhci-trace.h" - --#define PORT2_SSIC_CONFIG_REG2 0x883c -+#define SSIC_PORT_NUM 2 -+#define SSIC_PORT_CFG2 0x880c -+#define SSIC_PORT_CFG2_OFFSET 0x30 - #define PROG_DONE (1 << 30) - #define SSIC_PORT_UNUSED (1 << 31) - -@@ -45,6 +47,7 @@ - #define PCI_DEVICE_ID_INTEL_CHERRYVIEW_XHCI 0x22b5 - #define PCI_DEVICE_ID_INTEL_SUNRISEPOINT_H_XHCI 0xa12f - #define PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_XHCI 0x9d2f -+#define PCI_DEVICE_ID_INTEL_BROXTON_M_XHCI 0x0aa8 - - static const char hcd_name[] = "xhci_hcd"; - -@@ -152,7 +155,8 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci) - if (pdev->vendor == PCI_VENDOR_ID_INTEL && - (pdev->device == PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_XHCI || - pdev->device == PCI_DEVICE_ID_INTEL_SUNRISEPOINT_H_XHCI || -- pdev->device == PCI_DEVICE_ID_INTEL_CHERRYVIEW_XHCI)) { -+ pdev->device == PCI_DEVICE_ID_INTEL_CHERRYVIEW_XHCI || -+ pdev->device == PCI_DEVICE_ID_INTEL_BROXTON_M_XHCI)) { - xhci->quirks |= XHCI_PME_STUCK_QUIRK; - } - if (pdev->vendor == PCI_VENDOR_ID_ETRON && -@@ -322,28 +326,36 @@ static void xhci_pme_quirk(struct usb_hcd *hcd, bool suspend) - struct pci_dev *pdev = to_pci_dev(hcd->self.controller); - u32 val; - void __iomem *reg; -+ int i; - - if (pdev->vendor == PCI_VENDOR_ID_INTEL && - pdev->device == PCI_DEVICE_ID_INTEL_CHERRYVIEW_XHCI) { - -- reg = (void __iomem *) xhci->cap_regs + PORT2_SSIC_CONFIG_REG2; -- -- /* Notify SSIC that SSIC profile programming is not done */ -- val = readl(reg) & ~PROG_DONE; -- writel(val, reg); -- -- /* Mark SSIC port as unused(suspend) or used(resume) */ -- val = readl(reg); -- if (suspend) -- val |= SSIC_PORT_UNUSED; -- else -- val &= ~SSIC_PORT_UNUSED; -- writel(val, reg); -- -- /* Notify SSIC that SSIC profile programming is done */ -- val = readl(reg) | PROG_DONE; -- writel(val, reg); -- readl(reg); -+ for (i = 0; i < SSIC_PORT_NUM; i++) { -+ reg = (void __iomem *) xhci->cap_regs + -+ SSIC_PORT_CFG2 + -+ i * SSIC_PORT_CFG2_OFFSET; -+ -+ /* -+ * Notify SSIC that SSIC profile programming -+ * is not done. -+ */ -+ val = readl(reg) & ~PROG_DONE; -+ writel(val, reg); -+ -+ /* Mark SSIC port as unused(suspend) or used(resume) */ -+ val = readl(reg); -+ if (suspend) -+ val |= SSIC_PORT_UNUSED; -+ else -+ val &= ~SSIC_PORT_UNUSED; -+ writel(val, reg); -+ -+ /* Notify SSIC that SSIC profile programming is done */ -+ val = readl(reg) | PROG_DONE; -+ writel(val, reg); -+ readl(reg); -+ } - } - - reg = (void __iomem *) xhci->cap_regs + 0x80a4; -diff --git a/drivers/usb/phy/phy-msm-usb.c b/drivers/usb/phy/phy-msm-usb.c -index 0d19a6d..970a30e 100644 ---- a/drivers/usb/phy/phy-msm-usb.c -+++ b/drivers/usb/phy/phy-msm-usb.c -@@ -1599,6 +1599,8 @@ static int msm_otg_read_dt(struct platform_device *pdev, struct msm_otg *motg) - &motg->id.nb); - if (ret < 0) { - dev_err(&pdev->dev, "register ID notifier failed\n"); -+ extcon_unregister_notifier(motg->vbus.extcon, -+ EXTCON_USB, &motg->vbus.nb); - return ret; - } - -@@ -1660,15 +1662,6 @@ static int msm_otg_probe(struct platform_device *pdev) - if (!motg) - return -ENOMEM; - -- pdata = dev_get_platdata(&pdev->dev); -- if (!pdata) { -- if (!np) -- return -ENXIO; -- ret = msm_otg_read_dt(pdev, motg); -- if (ret) -- return ret; -- } -- - motg->phy.otg = devm_kzalloc(&pdev->dev, sizeof(struct usb_otg), - GFP_KERNEL); - if (!motg->phy.otg) -@@ -1710,6 +1703,15 @@ static int msm_otg_probe(struct platform_device *pdev) - if (!motg->regs) - return -ENOMEM; - -+ pdata = dev_get_platdata(&pdev->dev); -+ if (!pdata) { -+ if (!np) -+ return -ENXIO; -+ ret = msm_otg_read_dt(pdev, motg); -+ if (ret) -+ return ret; -+ } -+ - /* - * NOTE: The PHYs can be multiplexed between the chipidea controller - * and the dwc3 controller, using a single bit. It is important that -@@ -1717,8 +1719,10 @@ static int msm_otg_probe(struct platform_device *pdev) - */ - if (motg->phy_number) { - phy_select = devm_ioremap_nocache(&pdev->dev, USB2_PHY_SEL, 4); -- if (!phy_select) -- return -ENOMEM; -+ if (!phy_select) { -+ ret = -ENOMEM; -+ goto unregister_extcon; -+ } - /* Enable second PHY with the OTG port */ - writel(0x1, phy_select); - } -@@ -1728,7 +1732,8 @@ static int msm_otg_probe(struct platform_device *pdev) - motg->irq = platform_get_irq(pdev, 0); - if (motg->irq < 0) { - dev_err(&pdev->dev, "platform_get_irq failed\n"); -- return motg->irq; -+ ret = motg->irq; -+ goto unregister_extcon; - } - - regs[0].supply = "vddcx"; -@@ -1737,7 +1742,7 @@ static int msm_otg_probe(struct platform_device *pdev) - - ret = devm_regulator_bulk_get(motg->phy.dev, ARRAY_SIZE(regs), regs); - if (ret) -- return ret; -+ goto unregister_extcon; - - motg->vddcx = regs[0].consumer; - motg->v3p3 = regs[1].consumer; -@@ -1834,6 +1839,12 @@ disable_clks: - clk_disable_unprepare(motg->clk); - if (!IS_ERR(motg->core_clk)) - clk_disable_unprepare(motg->core_clk); -+unregister_extcon: -+ extcon_unregister_notifier(motg->id.extcon, -+ EXTCON_USB_HOST, &motg->id.nb); -+ extcon_unregister_notifier(motg->vbus.extcon, -+ EXTCON_USB, &motg->vbus.nb); -+ - return ret; - } - -diff --git a/drivers/usb/serial/cp210x.c b/drivers/usb/serial/cp210x.c -index 59b2126..1dd9919 100644 ---- a/drivers/usb/serial/cp210x.c -+++ b/drivers/usb/serial/cp210x.c -@@ -98,6 +98,7 @@ static const struct usb_device_id id_table[] = { - { USB_DEVICE(0x10C4, 0x81AC) }, /* MSD Dash Hawk */ - { USB_DEVICE(0x10C4, 0x81AD) }, /* INSYS USB Modem */ - { USB_DEVICE(0x10C4, 0x81C8) }, /* Lipowsky Industrie Elektronik GmbH, Baby-JTAG */ -+ { USB_DEVICE(0x10C4, 0x81D7) }, /* IAI Corp. RCB-CV-USB USB to RS485 Adaptor */ - { USB_DEVICE(0x10C4, 0x81E2) }, /* Lipowsky Industrie Elektronik GmbH, Baby-LIN */ - { USB_DEVICE(0x10C4, 0x81E7) }, /* Aerocomm Radio */ - { USB_DEVICE(0x10C4, 0x81E8) }, /* Zephyr Bioharness */ -diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c -index a5a0376..8c660ae 100644 ---- a/drivers/usb/serial/ftdi_sio.c -+++ b/drivers/usb/serial/ftdi_sio.c -@@ -824,6 +824,7 @@ static const struct usb_device_id id_table_combined[] = { - { USB_DEVICE(FTDI_VID, FTDI_TURTELIZER_PID), - .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, - { USB_DEVICE(RATOC_VENDOR_ID, RATOC_PRODUCT_ID_USB60F) }, -+ { USB_DEVICE(RATOC_VENDOR_ID, RATOC_PRODUCT_ID_SCU18) }, - { USB_DEVICE(FTDI_VID, FTDI_REU_TINY_PID) }, - - /* Papouch devices based on FTDI chip */ -diff --git a/drivers/usb/serial/ftdi_sio_ids.h b/drivers/usb/serial/ftdi_sio_ids.h -index 67c6d44..a84df25 100644 ---- a/drivers/usb/serial/ftdi_sio_ids.h -+++ b/drivers/usb/serial/ftdi_sio_ids.h -@@ -615,6 +615,7 @@ - */ - #define RATOC_VENDOR_ID 0x0584 - #define RATOC_PRODUCT_ID_USB60F 0xb020 -+#define RATOC_PRODUCT_ID_SCU18 0xb03a - - /* - * Infineon Technologies -diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c -index f228060..db86e51 100644 ---- a/drivers/usb/serial/option.c -+++ b/drivers/usb/serial/option.c -@@ -268,6 +268,8 @@ static void option_instat_callback(struct urb *urb); - #define TELIT_PRODUCT_CC864_SINGLE 0x1006 - #define TELIT_PRODUCT_DE910_DUAL 0x1010 - #define TELIT_PRODUCT_UE910_V2 0x1012 -+#define TELIT_PRODUCT_LE922_USBCFG0 0x1042 -+#define TELIT_PRODUCT_LE922_USBCFG3 0x1043 - #define TELIT_PRODUCT_LE920 0x1200 - #define TELIT_PRODUCT_LE910 0x1201 - -@@ -615,6 +617,16 @@ static const struct option_blacklist_info telit_le920_blacklist = { - .reserved = BIT(1) | BIT(5), - }; - -+static const struct option_blacklist_info telit_le922_blacklist_usbcfg0 = { -+ .sendsetup = BIT(2), -+ .reserved = BIT(0) | BIT(1) | BIT(3), -+}; -+ -+static const struct option_blacklist_info telit_le922_blacklist_usbcfg3 = { -+ .sendsetup = BIT(0), -+ .reserved = BIT(1) | BIT(2) | BIT(3), -+}; -+ - static const struct usb_device_id option_ids[] = { - { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COLT) }, - { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA) }, -@@ -1160,6 +1172,10 @@ static const struct usb_device_id option_ids[] = { - { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_CC864_SINGLE) }, - { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_DE910_DUAL) }, - { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_UE910_V2) }, -+ { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_LE922_USBCFG0), -+ .driver_info = (kernel_ulong_t)&telit_le922_blacklist_usbcfg0 }, -+ { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_LE922_USBCFG3), -+ .driver_info = (kernel_ulong_t)&telit_le922_blacklist_usbcfg3 }, - { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_LE910), - .driver_info = (kernel_ulong_t)&telit_le910_blacklist }, - { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_LE920), -@@ -1679,7 +1695,7 @@ static const struct usb_device_id option_ids[] = { - { USB_DEVICE(CINTERION_VENDOR_ID, CINTERION_PRODUCT_EU3_P) }, - { USB_DEVICE(CINTERION_VENDOR_ID, CINTERION_PRODUCT_PH8), - .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, -- { USB_DEVICE(CINTERION_VENDOR_ID, CINTERION_PRODUCT_AHXX) }, -+ { USB_DEVICE_INTERFACE_CLASS(CINTERION_VENDOR_ID, CINTERION_PRODUCT_AHXX, 0xff) }, - { USB_DEVICE(CINTERION_VENDOR_ID, CINTERION_PRODUCT_PLXX), - .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, - { USB_DEVICE(CINTERION_VENDOR_ID, CINTERION_PRODUCT_HC28_MDM) }, -diff --git a/drivers/usb/serial/visor.c b/drivers/usb/serial/visor.c -index 60afb39..337a0be 100644 ---- a/drivers/usb/serial/visor.c -+++ b/drivers/usb/serial/visor.c -@@ -544,6 +544,11 @@ static int treo_attach(struct usb_serial *serial) - (serial->num_interrupt_in == 0)) - return 0; - -+ if (serial->num_bulk_in < 2 || serial->num_interrupt_in < 2) { -+ dev_err(&serial->interface->dev, "missing endpoints\n"); -+ return -ENODEV; -+ } -+ - /* - * It appears that Treos and Kyoceras want to use the - * 1st bulk in endpoint to communicate with the 2nd bulk out endpoint, -@@ -597,8 +602,10 @@ static int clie_5_attach(struct usb_serial *serial) - */ - - /* some sanity check */ -- if (serial->num_ports < 2) -- return -1; -+ if (serial->num_bulk_out < 2) { -+ dev_err(&serial->interface->dev, "missing bulk out endpoints\n"); -+ return -ENODEV; -+ } - - /* port 0 now uses the modified endpoint Address */ - port = serial->port[0]; -diff --git a/fs/ext4/crypto_key.c b/fs/ext4/crypto_key.c -index c5882b3..9a16d1e 100644 ---- a/fs/ext4/crypto_key.c -+++ b/fs/ext4/crypto_key.c -@@ -213,9 +213,11 @@ retry: - res = -ENOKEY; - goto out; - } -+ down_read(&keyring_key->sem); - ukp = user_key_payload(keyring_key); - if (ukp->datalen != sizeof(struct ext4_encryption_key)) { - res = -EINVAL; -+ up_read(&keyring_key->sem); - goto out; - } - master_key = (struct ext4_encryption_key *)ukp->data; -@@ -226,10 +228,12 @@ retry: - "ext4: key size incorrect: %d\n", - master_key->size); - res = -ENOKEY; -+ up_read(&keyring_key->sem); - goto out; - } - res = ext4_derive_key_aes(ctx.nonce, master_key->raw, - raw_key); -+ up_read(&keyring_key->sem); - if (res) - goto out; - got_key: -diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c -index 8981803..343b0f1 100644 ---- a/fs/nfs/nfs4proc.c -+++ b/fs/nfs/nfs4proc.c -@@ -8054,7 +8054,6 @@ static void nfs4_layoutreturn_release(void *calldata) - pnfs_set_layout_stateid(lo, &lrp->res.stateid, true); - pnfs_mark_matching_lsegs_invalid(lo, &freeme, &lrp->args.range); - pnfs_clear_layoutreturn_waitbit(lo); -- lo->plh_block_lgets--; - spin_unlock(&lo->plh_inode->i_lock); - pnfs_free_lseg_list(&freeme); - pnfs_put_layout_hdr(lrp->args.layout); -diff --git a/fs/ocfs2/dlm/dlmmaster.c b/fs/ocfs2/dlm/dlmmaster.c -index 84f2f80..4e2162b 100644 ---- a/fs/ocfs2/dlm/dlmmaster.c -+++ b/fs/ocfs2/dlm/dlmmaster.c -@@ -2519,6 +2519,11 @@ static int dlm_migrate_lockres(struct dlm_ctxt *dlm, - spin_lock(&dlm->master_lock); - ret = dlm_add_migration_mle(dlm, res, mle, &oldmle, name, - namelen, target, dlm->node_num); -+ /* get an extra reference on the mle. -+ * otherwise the assert_master from the new -+ * master will destroy this. -+ */ -+ dlm_get_mle_inuse(mle); - spin_unlock(&dlm->master_lock); - spin_unlock(&dlm->spinlock); - -@@ -2554,6 +2559,7 @@ fail: - if (mle_added) { - dlm_mle_detach_hb_events(dlm, mle); - dlm_put_mle(mle); -+ dlm_put_mle_inuse(mle); - } else if (mle) { - kmem_cache_free(dlm_mle_cache, mle); - mle = NULL; -@@ -2571,17 +2577,6 @@ fail: - * ensure that all assert_master work is flushed. */ - flush_workqueue(dlm->dlm_worker); - -- /* get an extra reference on the mle. -- * otherwise the assert_master from the new -- * master will destroy this. -- * also, make sure that all callers of dlm_get_mle -- * take both dlm->spinlock and dlm->master_lock */ -- spin_lock(&dlm->spinlock); -- spin_lock(&dlm->master_lock); -- dlm_get_mle_inuse(mle); -- spin_unlock(&dlm->master_lock); -- spin_unlock(&dlm->spinlock); -- - /* notify new node and send all lock state */ - /* call send_one_lockres with migration flag. - * this serves as notice to the target node that a -@@ -3312,6 +3307,15 @@ top: - mle->new_master != dead_node) - continue; - -+ if (mle->new_master == dead_node && mle->inuse) { -+ mlog(ML_NOTICE, "%s: target %u died during " -+ "migration from %u, the MLE is " -+ "still keep used, ignore it!\n", -+ dlm->name, dead_node, -+ mle->master); -+ continue; -+ } -+ - /* If we have reached this point, this mle needs to be - * removed from the list and freed. */ - dlm_clean_migration_mle(dlm, mle); -diff --git a/fs/ocfs2/dlm/dlmrecovery.c b/fs/ocfs2/dlm/dlmrecovery.c -index 9e4f862..42f0cae 100644 ---- a/fs/ocfs2/dlm/dlmrecovery.c -+++ b/fs/ocfs2/dlm/dlmrecovery.c -@@ -2360,6 +2360,8 @@ static void dlm_do_local_recovery_cleanup(struct dlm_ctxt *dlm, u8 dead_node) - break; - } - } -+ dlm_lockres_clear_refmap_bit(dlm, res, -+ dead_node); - spin_unlock(&res->spinlock); - continue; - } -diff --git a/fs/ocfs2/dlmglue.c b/fs/ocfs2/dlmglue.c -index 20276e3..b002acf 100644 ---- a/fs/ocfs2/dlmglue.c -+++ b/fs/ocfs2/dlmglue.c -@@ -1390,6 +1390,7 @@ static int __ocfs2_cluster_lock(struct ocfs2_super *osb, - unsigned int gen; - int noqueue_attempted = 0; - int dlm_locked = 0; -+ int kick_dc = 0; - - if (!(lockres->l_flags & OCFS2_LOCK_INITIALIZED)) { - mlog_errno(-EINVAL); -@@ -1524,7 +1525,12 @@ update_holders: - unlock: - lockres_clear_flags(lockres, OCFS2_LOCK_UPCONVERT_FINISHING); - -+ /* ocfs2_unblock_lock reques on seeing OCFS2_LOCK_UPCONVERT_FINISHING */ -+ kick_dc = (lockres->l_flags & OCFS2_LOCK_BLOCKED); -+ - spin_unlock_irqrestore(&lockres->l_lock, flags); -+ if (kick_dc) -+ ocfs2_wake_downconvert_thread(osb); - out: - /* - * This is helping work around a lock inversion between the page lock -diff --git a/include/crypto/hash.h b/include/crypto/hash.h -index 3d69c93..6361892 100644 ---- a/include/crypto/hash.h -+++ b/include/crypto/hash.h -@@ -204,6 +204,7 @@ struct crypto_ahash { - unsigned int keylen); - - unsigned int reqsize; -+ bool has_setkey; - struct crypto_tfm base; - }; - -@@ -375,6 +376,11 @@ static inline void *ahash_request_ctx(struct ahash_request *req) - int crypto_ahash_setkey(struct crypto_ahash *tfm, const u8 *key, - unsigned int keylen); - -+static inline bool crypto_ahash_has_setkey(struct crypto_ahash *tfm) -+{ -+ return tfm->has_setkey; -+} -+ - /** - * crypto_ahash_finup() - update and finalize message digest - * @req: reference to the ahash_request handle that holds all information -diff --git a/include/crypto/if_alg.h b/include/crypto/if_alg.h -index 018afb2..a2bfd78 100644 ---- a/include/crypto/if_alg.h -+++ b/include/crypto/if_alg.h -@@ -30,6 +30,9 @@ struct alg_sock { - - struct sock *parent; - -+ unsigned int refcnt; -+ unsigned int nokey_refcnt; -+ - const struct af_alg_type *type; - void *private; - }; -@@ -50,9 +53,11 @@ struct af_alg_type { - void (*release)(void *private); - int (*setkey)(void *private, const u8 *key, unsigned int keylen); - int (*accept)(void *private, struct sock *sk); -+ int (*accept_nokey)(void *private, struct sock *sk); - int (*setauthsize)(void *private, unsigned int authsize); - - struct proto_ops *ops; -+ struct proto_ops *ops_nokey; - struct module *owner; - char name[14]; - }; -@@ -67,6 +72,7 @@ int af_alg_register_type(const struct af_alg_type *type); - int af_alg_unregister_type(const struct af_alg_type *type); - - int af_alg_release(struct socket *sock); -+void af_alg_release_parent(struct sock *sk); - int af_alg_accept(struct sock *sk, struct socket *newsock); - - int af_alg_make_sg(struct af_alg_sgl *sgl, struct iov_iter *iter, int len); -@@ -83,11 +89,6 @@ static inline struct alg_sock *alg_sk(struct sock *sk) - return (struct alg_sock *)sk; - } - --static inline void af_alg_release_parent(struct sock *sk) --{ -- sock_put(alg_sk(sk)->parent); --} -- - static inline void af_alg_init_completion(struct af_alg_completion *completion) - { - init_completion(&completion->completion); -diff --git a/include/crypto/skcipher.h b/include/crypto/skcipher.h -index d8dd41f..fd8742a 100644 ---- a/include/crypto/skcipher.h -+++ b/include/crypto/skcipher.h -@@ -61,6 +61,8 @@ struct crypto_skcipher { - unsigned int ivsize; - unsigned int reqsize; - -+ bool has_setkey; -+ - struct crypto_tfm base; - }; - -@@ -305,6 +307,11 @@ static inline int crypto_skcipher_setkey(struct crypto_skcipher *tfm, - return tfm->setkey(tfm, key, keylen); - } - -+static inline bool crypto_skcipher_has_setkey(struct crypto_skcipher *tfm) -+{ -+ return tfm->has_setkey; -+} -+ - /** - * crypto_skcipher_reqtfm() - obtain cipher handle from request - * @req: skcipher_request out of which the cipher handle is to be obtained -diff --git a/include/linux/console.h b/include/linux/console.h -index bd19434..ea731af 100644 ---- a/include/linux/console.h -+++ b/include/linux/console.h -@@ -150,6 +150,7 @@ extern int console_trylock(void); - extern void console_unlock(void); - extern void console_conditional_schedule(void); - extern void console_unblank(void); -+extern void console_flush_on_panic(void); - extern struct tty_driver *console_device(int *); - extern void console_stop(struct console *); - extern void console_start(struct console *); -diff --git a/include/linux/hrtimer.h b/include/linux/hrtimer.h -index 76dd4f0..2ead22d 100644 ---- a/include/linux/hrtimer.h -+++ b/include/linux/hrtimer.h -@@ -87,7 +87,8 @@ enum hrtimer_restart { - * @function: timer expiry callback function - * @base: pointer to the timer base (per cpu and per clock) - * @state: state information (See bit values above) -- * @start_pid: timer statistics field to store the pid of the task which -+ * @is_rel: Set if the timer was armed relative -+ * @start_pid: timer statistics field to store the pid of the task which - * started the timer - * @start_site: timer statistics field to store the site where the timer - * was started -@@ -101,7 +102,8 @@ struct hrtimer { - ktime_t _softexpires; - enum hrtimer_restart (*function)(struct hrtimer *); - struct hrtimer_clock_base *base; -- unsigned long state; -+ u8 state; -+ u8 is_rel; - #ifdef CONFIG_TIMER_STATS - int start_pid; - void *start_site; -@@ -321,6 +323,27 @@ static inline void clock_was_set_delayed(void) { } - - #endif - -+static inline ktime_t -+__hrtimer_expires_remaining_adjusted(const struct hrtimer *timer, ktime_t now) -+{ -+ ktime_t rem = ktime_sub(timer->node.expires, now); -+ -+ /* -+ * Adjust relative timers for the extra we added in -+ * hrtimer_start_range_ns() to prevent short timeouts. -+ */ -+ if (IS_ENABLED(CONFIG_TIME_LOW_RES) && timer->is_rel) -+ rem.tv64 -= hrtimer_resolution; -+ return rem; -+} -+ -+static inline ktime_t -+hrtimer_expires_remaining_adjusted(const struct hrtimer *timer) -+{ -+ return __hrtimer_expires_remaining_adjusted(timer, -+ timer->base->get_time()); -+} -+ - extern void clock_was_set(void); - #ifdef CONFIG_TIMERFD - extern void timerfd_clock_was_set(void); -@@ -390,7 +413,12 @@ static inline void hrtimer_restart(struct hrtimer *timer) - } - - /* Query timers: */ --extern ktime_t hrtimer_get_remaining(const struct hrtimer *timer); -+extern ktime_t __hrtimer_get_remaining(const struct hrtimer *timer, bool adjust); -+ -+static inline ktime_t hrtimer_get_remaining(const struct hrtimer *timer) -+{ -+ return __hrtimer_get_remaining(timer, false); -+} - - extern u64 hrtimer_get_next_event(void); - -diff --git a/include/linux/tty.h b/include/linux/tty.h -index 5e31f1b..6b6e811 100644 ---- a/include/linux/tty.h -+++ b/include/linux/tty.h -@@ -654,6 +654,7 @@ extern long vt_compat_ioctl(struct tty_struct *tty, - /* tty_mutex.c */ - /* functions for preparation of BKL removal */ - extern void __lockfunc tty_lock(struct tty_struct *tty); -+extern int tty_lock_interruptible(struct tty_struct *tty); - extern void __lockfunc tty_unlock(struct tty_struct *tty); - extern void __lockfunc tty_lock_slave(struct tty_struct *tty); - extern void __lockfunc tty_unlock_slave(struct tty_struct *tty); -diff --git a/include/sound/rawmidi.h b/include/sound/rawmidi.h -index f6cbef7..3b91ad5 100644 ---- a/include/sound/rawmidi.h -+++ b/include/sound/rawmidi.h -@@ -167,6 +167,10 @@ int snd_rawmidi_transmit_peek(struct snd_rawmidi_substream *substream, - int snd_rawmidi_transmit_ack(struct snd_rawmidi_substream *substream, int count); - int snd_rawmidi_transmit(struct snd_rawmidi_substream *substream, - unsigned char *buffer, int count); -+int __snd_rawmidi_transmit_peek(struct snd_rawmidi_substream *substream, -+ unsigned char *buffer, int count); -+int __snd_rawmidi_transmit_ack(struct snd_rawmidi_substream *substream, -+ int count); - - /* main midi functions */ - -diff --git a/kernel/panic.c b/kernel/panic.c -index 4b150bc..41e2b54 100644 ---- a/kernel/panic.c -+++ b/kernel/panic.c -@@ -157,8 +157,7 @@ void panic(const char *fmt, ...) - * panic() is not being callled from OOPS. - */ - debug_locks_off(); -- console_trylock(); -- console_unlock(); -+ console_flush_on_panic(); - - if (!panic_blink) - panic_blink = no_blink; -diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c -index 2ce8826..c048e34 100644 ---- a/kernel/printk/printk.c -+++ b/kernel/printk/printk.c -@@ -2233,13 +2233,24 @@ void console_unlock(void) - static u64 seen_seq; - unsigned long flags; - bool wake_klogd = false; -- bool retry; -+ bool do_cond_resched, retry; - - if (console_suspended) { - up_console_sem(); - return; - } - -+ /* -+ * Console drivers are called under logbuf_lock, so -+ * @console_may_schedule should be cleared before; however, we may -+ * end up dumping a lot of lines, for example, if called from -+ * console registration path, and should invoke cond_resched() -+ * between lines if allowable. Not doing so can cause a very long -+ * scheduling stall on a slow console leading to RCU stall and -+ * softlockup warnings which exacerbate the issue with more -+ * messages practically incapacitating the system. -+ */ -+ do_cond_resched = console_may_schedule; - console_may_schedule = 0; - - /* flush buffered message fragment immediately to console */ -@@ -2311,6 +2322,9 @@ skip: - call_console_drivers(level, ext_text, ext_len, text, len); - start_critical_timings(); - local_irq_restore(flags); -+ -+ if (do_cond_resched) -+ cond_resched(); - } - console_locked = 0; - -@@ -2378,6 +2392,25 @@ void console_unblank(void) - console_unlock(); - } - -+/** -+ * console_flush_on_panic - flush console content on panic -+ * -+ * Immediately output all pending messages no matter what. -+ */ -+void console_flush_on_panic(void) -+{ -+ /* -+ * If someone else is holding the console lock, trylock will fail -+ * and may_schedule may be set. Ignore and proceed to unlock so -+ * that messages are flushed out. As this can be called from any -+ * context and we don't want to get preempted while flushing, -+ * ensure may_schedule is cleared. -+ */ -+ console_trylock(); -+ console_may_schedule = 0; -+ console_unlock(); -+} -+ - /* - * Return the console tty driver structure and its associated index - */ -diff --git a/kernel/sched/core.c b/kernel/sched/core.c -index 732e993..eb70592 100644 ---- a/kernel/sched/core.c -+++ b/kernel/sched/core.c -@@ -6738,7 +6738,7 @@ static void sched_init_numa(void) - - sched_domains_numa_masks[i][j] = mask; - -- for (k = 0; k < nr_node_ids; k++) { -+ for_each_node(k) { - if (node_distance(j, k) > sched_domains_numa_distance[i]) - continue; - -diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c -index 435b885..fa909f9 100644 ---- a/kernel/time/hrtimer.c -+++ b/kernel/time/hrtimer.c -@@ -897,10 +897,10 @@ static int enqueue_hrtimer(struct hrtimer *timer, - */ - static void __remove_hrtimer(struct hrtimer *timer, - struct hrtimer_clock_base *base, -- unsigned long newstate, int reprogram) -+ u8 newstate, int reprogram) - { - struct hrtimer_cpu_base *cpu_base = base->cpu_base; -- unsigned int state = timer->state; -+ u8 state = timer->state; - - timer->state = newstate; - if (!(state & HRTIMER_STATE_ENQUEUED)) -@@ -930,7 +930,7 @@ static inline int - remove_hrtimer(struct hrtimer *timer, struct hrtimer_clock_base *base, bool restart) - { - if (hrtimer_is_queued(timer)) { -- unsigned long state = timer->state; -+ u8 state = timer->state; - int reprogram; - - /* -@@ -954,6 +954,22 @@ remove_hrtimer(struct hrtimer *timer, struct hrtimer_clock_base *base, bool rest - return 0; - } - -+static inline ktime_t hrtimer_update_lowres(struct hrtimer *timer, ktime_t tim, -+ const enum hrtimer_mode mode) -+{ -+#ifdef CONFIG_TIME_LOW_RES -+ /* -+ * CONFIG_TIME_LOW_RES indicates that the system has no way to return -+ * granular time values. For relative timers we add hrtimer_resolution -+ * (i.e. one jiffie) to prevent short timeouts. -+ */ -+ timer->is_rel = mode & HRTIMER_MODE_REL; -+ if (timer->is_rel) -+ tim = ktime_add_safe(tim, ktime_set(0, hrtimer_resolution)); -+#endif -+ return tim; -+} -+ - /** - * hrtimer_start_range_ns - (re)start an hrtimer on the current CPU - * @timer: the timer to be added -@@ -974,19 +990,10 @@ void hrtimer_start_range_ns(struct hrtimer *timer, ktime_t tim, - /* Remove an active timer from the queue: */ - remove_hrtimer(timer, base, true); - -- if (mode & HRTIMER_MODE_REL) { -+ if (mode & HRTIMER_MODE_REL) - tim = ktime_add_safe(tim, base->get_time()); -- /* -- * CONFIG_TIME_LOW_RES is a temporary way for architectures -- * to signal that they simply return xtime in -- * do_gettimeoffset(). In this case we want to round up by -- * resolution when starting a relative timer, to avoid short -- * timeouts. This will go away with the GTOD framework. -- */ --#ifdef CONFIG_TIME_LOW_RES -- tim = ktime_add_safe(tim, ktime_set(0, hrtimer_resolution)); --#endif -- } -+ -+ tim = hrtimer_update_lowres(timer, tim, mode); - - hrtimer_set_expires_range_ns(timer, tim, delta_ns); - -@@ -1074,19 +1081,23 @@ EXPORT_SYMBOL_GPL(hrtimer_cancel); - /** - * hrtimer_get_remaining - get remaining time for the timer - * @timer: the timer to read -+ * @adjust: adjust relative timers when CONFIG_TIME_LOW_RES=y - */ --ktime_t hrtimer_get_remaining(const struct hrtimer *timer) -+ktime_t __hrtimer_get_remaining(const struct hrtimer *timer, bool adjust) - { - unsigned long flags; - ktime_t rem; - - lock_hrtimer_base(timer, &flags); -- rem = hrtimer_expires_remaining(timer); -+ if (IS_ENABLED(CONFIG_TIME_LOW_RES) && adjust) -+ rem = hrtimer_expires_remaining_adjusted(timer); -+ else -+ rem = hrtimer_expires_remaining(timer); - unlock_hrtimer_base(timer, &flags); - - return rem; - } --EXPORT_SYMBOL_GPL(hrtimer_get_remaining); -+EXPORT_SYMBOL_GPL(__hrtimer_get_remaining); - - #ifdef CONFIG_NO_HZ_COMMON - /** -@@ -1220,6 +1231,14 @@ static void __run_hrtimer(struct hrtimer_cpu_base *cpu_base, - fn = timer->function; - - /* -+ * Clear the 'is relative' flag for the TIME_LOW_RES case. If the -+ * timer is restarted with a period then it becomes an absolute -+ * timer. If its not restarted it does not matter. -+ */ -+ if (IS_ENABLED(CONFIG_TIME_LOW_RES)) -+ timer->is_rel = false; -+ -+ /* - * Because we run timers from hardirq context, there is no chance - * they get migrated to another cpu, therefore its safe to unlock - * the timer base. -diff --git a/kernel/time/timer_list.c b/kernel/time/timer_list.c -index f75e35b..ba7d8b2 100644 ---- a/kernel/time/timer_list.c -+++ b/kernel/time/timer_list.c -@@ -69,7 +69,7 @@ print_timer(struct seq_file *m, struct hrtimer *taddr, struct hrtimer *timer, - print_name_offset(m, taddr); - SEQ_printf(m, ", "); - print_name_offset(m, timer->function); -- SEQ_printf(m, ", S:%02lx", timer->state); -+ SEQ_printf(m, ", S:%02x", timer->state); - #ifdef CONFIG_TIMER_STATS - SEQ_printf(m, ", "); - print_name_offset(m, timer->start_site); -diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c -index 87fb980..d929340 100644 ---- a/kernel/trace/trace.c -+++ b/kernel/trace/trace.c -@@ -1751,7 +1751,7 @@ void trace_buffer_unlock_commit_regs(struct trace_array *tr, - { - __buffer_unlock_commit(buffer, event); - -- ftrace_trace_stack(tr, buffer, flags, 6, pc, regs); -+ ftrace_trace_stack(tr, buffer, flags, 0, pc, regs); - ftrace_trace_userstack(buffer, flags, pc); - } - EXPORT_SYMBOL_GPL(trace_buffer_unlock_commit_regs); -diff --git a/kernel/trace/trace_stack.c b/kernel/trace/trace_stack.c -index dda9e67..202df6c 100644 ---- a/kernel/trace/trace_stack.c -+++ b/kernel/trace/trace_stack.c -@@ -126,6 +126,13 @@ check_stack(unsigned long ip, unsigned long *stack) - } - - /* -+ * Some archs may not have the passed in ip in the dump. -+ * If that happens, we need to show everything. -+ */ -+ if (i == stack_trace_max.nr_entries) -+ i = 0; -+ -+ /* - * Now find where in the stack these are. - */ - x = 0; -diff --git a/lib/libcrc32c.c b/lib/libcrc32c.c -index 6a08ce7..acf9da4 100644 ---- a/lib/libcrc32c.c -+++ b/lib/libcrc32c.c -@@ -74,3 +74,4 @@ module_exit(libcrc32c_mod_fini); - MODULE_AUTHOR("Clay Haapala <chaapala@cisco.com>"); - MODULE_DESCRIPTION("CRC32c (Castagnoli) calculations"); - MODULE_LICENSE("GPL"); -+MODULE_SOFTDEP("pre: crc32c"); -diff --git a/mm/backing-dev.c b/mm/backing-dev.c -index 7340353..cbe6f0b 100644 ---- a/mm/backing-dev.c -+++ b/mm/backing-dev.c -@@ -989,7 +989,7 @@ long wait_iff_congested(struct zone *zone, int sync, long timeout) - * here rather than calling cond_resched(). - */ - if (current->flags & PF_WQ_WORKER) -- schedule_timeout(1); -+ schedule_timeout_uninterruptible(1); - else - cond_resched(); - -diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c -index 9f15bdd..fc08399 100644 ---- a/mm/zsmalloc.c -+++ b/mm/zsmalloc.c -@@ -309,7 +309,12 @@ static void free_handle(struct zs_pool *pool, unsigned long handle) - - static void record_obj(unsigned long handle, unsigned long obj) - { -- *(unsigned long *)handle = obj; -+ /* -+ * lsb of @obj represents handle lock while other bits -+ * represent object value the handle is pointing so -+ * updating shouldn't do store tearing. -+ */ -+ WRITE_ONCE(*(unsigned long *)handle, obj); - } - - /* zpool driver */ -@@ -1635,6 +1640,13 @@ static int migrate_zspage(struct zs_pool *pool, struct size_class *class, - free_obj = obj_malloc(d_page, class, handle); - zs_object_copy(free_obj, used_obj, class); - index++; -+ /* -+ * record_obj updates handle's value to free_obj and it will -+ * invalidate lock bit(ie, HANDLE_PIN_BIT) of handle, which -+ * breaks synchronization using pin_tag(e,g, zs_free) so -+ * let's keep the lock bit. -+ */ -+ free_obj |= BIT(HANDLE_PIN_BIT); - record_obj(handle, free_obj); - unpin_tag(handle); - obj_free(pool, class, used_obj); -diff --git a/security/integrity/evm/evm_main.c b/security/integrity/evm/evm_main.c -index 1334e02..3d145a3 100644 ---- a/security/integrity/evm/evm_main.c -+++ b/security/integrity/evm/evm_main.c -@@ -23,6 +23,7 @@ - #include <linux/integrity.h> - #include <linux/evm.h> - #include <crypto/hash.h> -+#include <crypto/algapi.h> - #include "evm.h" - - int evm_initialized; -@@ -148,7 +149,7 @@ static enum integrity_status evm_verify_hmac(struct dentry *dentry, - xattr_value_len, calc.digest); - if (rc) - break; -- rc = memcmp(xattr_data->digest, calc.digest, -+ rc = crypto_memneq(xattr_data->digest, calc.digest, - sizeof(calc.digest)); - if (rc) - rc = -EINVAL; -diff --git a/sound/core/compress_offload.c b/sound/core/compress_offload.c -index b123c42..b554d7f 100644 ---- a/sound/core/compress_offload.c -+++ b/sound/core/compress_offload.c -@@ -44,6 +44,13 @@ - #include <sound/compress_offload.h> - #include <sound/compress_driver.h> - -+/* struct snd_compr_codec_caps overflows the ioctl bit size for some -+ * architectures, so we need to disable the relevant ioctls. -+ */ -+#if _IOC_SIZEBITS < 14 -+#define COMPR_CODEC_CAPS_OVERFLOW -+#endif -+ - /* TODO: - * - add substream support for multiple devices in case of - * SND_DYNAMIC_MINORS is not used -@@ -438,6 +445,7 @@ out: - return retval; - } - -+#ifndef COMPR_CODEC_CAPS_OVERFLOW - static int - snd_compr_get_codec_caps(struct snd_compr_stream *stream, unsigned long arg) - { -@@ -461,6 +469,7 @@ out: - kfree(caps); - return retval; - } -+#endif /* !COMPR_CODEC_CAPS_OVERFLOW */ - - /* revisit this with snd_pcm_preallocate_xxx */ - static int snd_compr_allocate_buffer(struct snd_compr_stream *stream, -@@ -799,9 +808,11 @@ static long snd_compr_ioctl(struct file *f, unsigned int cmd, unsigned long arg) - case _IOC_NR(SNDRV_COMPRESS_GET_CAPS): - retval = snd_compr_get_caps(stream, arg); - break; -+#ifndef COMPR_CODEC_CAPS_OVERFLOW - case _IOC_NR(SNDRV_COMPRESS_GET_CODEC_CAPS): - retval = snd_compr_get_codec_caps(stream, arg); - break; -+#endif - case _IOC_NR(SNDRV_COMPRESS_SET_PARAMS): - retval = snd_compr_set_params(stream, arg); - break; -diff --git a/sound/core/oss/pcm_oss.c b/sound/core/oss/pcm_oss.c -index 58550cc..33e72c8 100644 ---- a/sound/core/oss/pcm_oss.c -+++ b/sound/core/oss/pcm_oss.c -@@ -834,7 +834,8 @@ static int choose_rate(struct snd_pcm_substream *substream, - return snd_pcm_hw_param_near(substream, params, SNDRV_PCM_HW_PARAM_RATE, best_rate, NULL); - } - --static int snd_pcm_oss_change_params(struct snd_pcm_substream *substream) -+static int snd_pcm_oss_change_params(struct snd_pcm_substream *substream, -+ bool trylock) - { - struct snd_pcm_runtime *runtime = substream->runtime; - struct snd_pcm_hw_params *params, *sparams; -@@ -848,7 +849,10 @@ static int snd_pcm_oss_change_params(struct snd_pcm_substream *substream) - struct snd_mask sformat_mask; - struct snd_mask mask; - -- if (mutex_lock_interruptible(&runtime->oss.params_lock)) -+ if (trylock) { -+ if (!(mutex_trylock(&runtime->oss.params_lock))) -+ return -EAGAIN; -+ } else if (mutex_lock_interruptible(&runtime->oss.params_lock)) - return -EINTR; - sw_params = kmalloc(sizeof(*sw_params), GFP_KERNEL); - params = kmalloc(sizeof(*params), GFP_KERNEL); -@@ -1092,7 +1096,7 @@ static int snd_pcm_oss_get_active_substream(struct snd_pcm_oss_file *pcm_oss_fil - if (asubstream == NULL) - asubstream = substream; - if (substream->runtime->oss.params) { -- err = snd_pcm_oss_change_params(substream); -+ err = snd_pcm_oss_change_params(substream, false); - if (err < 0) - return err; - } -@@ -1132,7 +1136,7 @@ static int snd_pcm_oss_make_ready(struct snd_pcm_substream *substream) - return 0; - runtime = substream->runtime; - if (runtime->oss.params) { -- err = snd_pcm_oss_change_params(substream); -+ err = snd_pcm_oss_change_params(substream, false); - if (err < 0) - return err; - } -@@ -2163,7 +2167,7 @@ static int snd_pcm_oss_get_space(struct snd_pcm_oss_file *pcm_oss_file, int stre - runtime = substream->runtime; - - if (runtime->oss.params && -- (err = snd_pcm_oss_change_params(substream)) < 0) -+ (err = snd_pcm_oss_change_params(substream, false)) < 0) - return err; - - info.fragsize = runtime->oss.period_bytes; -@@ -2800,7 +2804,12 @@ static int snd_pcm_oss_mmap(struct file *file, struct vm_area_struct *area) - return -EIO; - - if (runtime->oss.params) { -- if ((err = snd_pcm_oss_change_params(substream)) < 0) -+ /* use mutex_trylock() for params_lock for avoiding a deadlock -+ * between mmap_sem and params_lock taken by -+ * copy_from/to_user() in snd_pcm_oss_write/read() -+ */ -+ err = snd_pcm_oss_change_params(substream, true); -+ if (err < 0) - return err; - } - #ifdef CONFIG_SND_PCM_OSS_PLUGINS -diff --git a/sound/core/rawmidi.c b/sound/core/rawmidi.c -index a775984..795437b 100644 ---- a/sound/core/rawmidi.c -+++ b/sound/core/rawmidi.c -@@ -942,31 +942,36 @@ static long snd_rawmidi_kernel_read1(struct snd_rawmidi_substream *substream, - unsigned long flags; - long result = 0, count1; - struct snd_rawmidi_runtime *runtime = substream->runtime; -+ unsigned long appl_ptr; - -+ spin_lock_irqsave(&runtime->lock, flags); - while (count > 0 && runtime->avail) { - count1 = runtime->buffer_size - runtime->appl_ptr; - if (count1 > count) - count1 = count; -- spin_lock_irqsave(&runtime->lock, flags); - if (count1 > (int)runtime->avail) - count1 = runtime->avail; -+ -+ /* update runtime->appl_ptr before unlocking for userbuf */ -+ appl_ptr = runtime->appl_ptr; -+ runtime->appl_ptr += count1; -+ runtime->appl_ptr %= runtime->buffer_size; -+ runtime->avail -= count1; -+ - if (kernelbuf) -- memcpy(kernelbuf + result, runtime->buffer + runtime->appl_ptr, count1); -+ memcpy(kernelbuf + result, runtime->buffer + appl_ptr, count1); - if (userbuf) { - spin_unlock_irqrestore(&runtime->lock, flags); - if (copy_to_user(userbuf + result, -- runtime->buffer + runtime->appl_ptr, count1)) { -+ runtime->buffer + appl_ptr, count1)) { - return result > 0 ? result : -EFAULT; - } - spin_lock_irqsave(&runtime->lock, flags); - } -- runtime->appl_ptr += count1; -- runtime->appl_ptr %= runtime->buffer_size; -- runtime->avail -= count1; -- spin_unlock_irqrestore(&runtime->lock, flags); - result += count1; - count -= count1; - } -+ spin_unlock_irqrestore(&runtime->lock, flags); - return result; - } - -@@ -1055,23 +1060,16 @@ int snd_rawmidi_transmit_empty(struct snd_rawmidi_substream *substream) - EXPORT_SYMBOL(snd_rawmidi_transmit_empty); - - /** -- * snd_rawmidi_transmit_peek - copy data from the internal buffer -+ * __snd_rawmidi_transmit_peek - copy data from the internal buffer - * @substream: the rawmidi substream - * @buffer: the buffer pointer - * @count: data size to transfer - * -- * Copies data from the internal output buffer to the given buffer. -- * -- * Call this in the interrupt handler when the midi output is ready, -- * and call snd_rawmidi_transmit_ack() after the transmission is -- * finished. -- * -- * Return: The size of copied data, or a negative error code on failure. -+ * This is a variant of snd_rawmidi_transmit_peek() without spinlock. - */ --int snd_rawmidi_transmit_peek(struct snd_rawmidi_substream *substream, -+int __snd_rawmidi_transmit_peek(struct snd_rawmidi_substream *substream, - unsigned char *buffer, int count) - { -- unsigned long flags; - int result, count1; - struct snd_rawmidi_runtime *runtime = substream->runtime; - -@@ -1081,7 +1079,6 @@ int snd_rawmidi_transmit_peek(struct snd_rawmidi_substream *substream, - return -EINVAL; - } - result = 0; -- spin_lock_irqsave(&runtime->lock, flags); - if (runtime->avail >= runtime->buffer_size) { - /* warning: lowlevel layer MUST trigger down the hardware */ - goto __skip; -@@ -1106,25 +1103,47 @@ int snd_rawmidi_transmit_peek(struct snd_rawmidi_substream *substream, - } - } - __skip: -+ return result; -+} -+EXPORT_SYMBOL(__snd_rawmidi_transmit_peek); -+ -+/** -+ * snd_rawmidi_transmit_peek - copy data from the internal buffer -+ * @substream: the rawmidi substream -+ * @buffer: the buffer pointer -+ * @count: data size to transfer -+ * -+ * Copies data from the internal output buffer to the given buffer. -+ * -+ * Call this in the interrupt handler when the midi output is ready, -+ * and call snd_rawmidi_transmit_ack() after the transmission is -+ * finished. -+ * -+ * Return: The size of copied data, or a negative error code on failure. -+ */ -+int snd_rawmidi_transmit_peek(struct snd_rawmidi_substream *substream, -+ unsigned char *buffer, int count) -+{ -+ struct snd_rawmidi_runtime *runtime = substream->runtime; -+ int result; -+ unsigned long flags; -+ -+ spin_lock_irqsave(&runtime->lock, flags); -+ result = __snd_rawmidi_transmit_peek(substream, buffer, count); - spin_unlock_irqrestore(&runtime->lock, flags); - return result; - } - EXPORT_SYMBOL(snd_rawmidi_transmit_peek); - - /** -- * snd_rawmidi_transmit_ack - acknowledge the transmission -+ * __snd_rawmidi_transmit_ack - acknowledge the transmission - * @substream: the rawmidi substream - * @count: the transferred count - * -- * Advances the hardware pointer for the internal output buffer with -- * the given size and updates the condition. -- * Call after the transmission is finished. -- * -- * Return: The advanced size if successful, or a negative error code on failure. -+ * This is a variant of __snd_rawmidi_transmit_ack() without spinlock. - */ --int snd_rawmidi_transmit_ack(struct snd_rawmidi_substream *substream, int count) -+int __snd_rawmidi_transmit_ack(struct snd_rawmidi_substream *substream, int count) - { -- unsigned long flags; - struct snd_rawmidi_runtime *runtime = substream->runtime; - - if (runtime->buffer == NULL) { -@@ -1132,7 +1151,6 @@ int snd_rawmidi_transmit_ack(struct snd_rawmidi_substream *substream, int count) - "snd_rawmidi_transmit_ack: output is not active!!!\n"); - return -EINVAL; - } -- spin_lock_irqsave(&runtime->lock, flags); - snd_BUG_ON(runtime->avail + count > runtime->buffer_size); - runtime->hw_ptr += count; - runtime->hw_ptr %= runtime->buffer_size; -@@ -1142,9 +1160,32 @@ int snd_rawmidi_transmit_ack(struct snd_rawmidi_substream *substream, int count) - if (runtime->drain || snd_rawmidi_ready(substream)) - wake_up(&runtime->sleep); - } -- spin_unlock_irqrestore(&runtime->lock, flags); - return count; - } -+EXPORT_SYMBOL(__snd_rawmidi_transmit_ack); -+ -+/** -+ * snd_rawmidi_transmit_ack - acknowledge the transmission -+ * @substream: the rawmidi substream -+ * @count: the transferred count -+ * -+ * Advances the hardware pointer for the internal output buffer with -+ * the given size and updates the condition. -+ * Call after the transmission is finished. -+ * -+ * Return: The advanced size if successful, or a negative error code on failure. -+ */ -+int snd_rawmidi_transmit_ack(struct snd_rawmidi_substream *substream, int count) -+{ -+ struct snd_rawmidi_runtime *runtime = substream->runtime; -+ int result; -+ unsigned long flags; -+ -+ spin_lock_irqsave(&runtime->lock, flags); -+ result = __snd_rawmidi_transmit_ack(substream, count); -+ spin_unlock_irqrestore(&runtime->lock, flags); -+ return result; -+} - EXPORT_SYMBOL(snd_rawmidi_transmit_ack); - - /** -@@ -1160,12 +1201,22 @@ EXPORT_SYMBOL(snd_rawmidi_transmit_ack); - int snd_rawmidi_transmit(struct snd_rawmidi_substream *substream, - unsigned char *buffer, int count) - { -+ struct snd_rawmidi_runtime *runtime = substream->runtime; -+ int result; -+ unsigned long flags; -+ -+ spin_lock_irqsave(&runtime->lock, flags); - if (!substream->opened) -- return -EBADFD; -- count = snd_rawmidi_transmit_peek(substream, buffer, count); -- if (count < 0) -- return count; -- return snd_rawmidi_transmit_ack(substream, count); -+ result = -EBADFD; -+ else { -+ count = __snd_rawmidi_transmit_peek(substream, buffer, count); -+ if (count <= 0) -+ result = count; -+ else -+ result = __snd_rawmidi_transmit_ack(substream, count); -+ } -+ spin_unlock_irqrestore(&runtime->lock, flags); -+ return result; - } - EXPORT_SYMBOL(snd_rawmidi_transmit); - -@@ -1177,8 +1228,9 @@ static long snd_rawmidi_kernel_write1(struct snd_rawmidi_substream *substream, - unsigned long flags; - long count1, result; - struct snd_rawmidi_runtime *runtime = substream->runtime; -+ unsigned long appl_ptr; - -- if (snd_BUG_ON(!kernelbuf && !userbuf)) -+ if (!kernelbuf && !userbuf) - return -EINVAL; - if (snd_BUG_ON(!runtime->buffer)) - return -EINVAL; -@@ -1197,12 +1249,19 @@ static long snd_rawmidi_kernel_write1(struct snd_rawmidi_substream *substream, - count1 = count; - if (count1 > (long)runtime->avail) - count1 = runtime->avail; -+ -+ /* update runtime->appl_ptr before unlocking for userbuf */ -+ appl_ptr = runtime->appl_ptr; -+ runtime->appl_ptr += count1; -+ runtime->appl_ptr %= runtime->buffer_size; -+ runtime->avail -= count1; -+ - if (kernelbuf) -- memcpy(runtime->buffer + runtime->appl_ptr, -+ memcpy(runtime->buffer + appl_ptr, - kernelbuf + result, count1); - else if (userbuf) { - spin_unlock_irqrestore(&runtime->lock, flags); -- if (copy_from_user(runtime->buffer + runtime->appl_ptr, -+ if (copy_from_user(runtime->buffer + appl_ptr, - userbuf + result, count1)) { - spin_lock_irqsave(&runtime->lock, flags); - result = result > 0 ? result : -EFAULT; -@@ -1210,9 +1269,6 @@ static long snd_rawmidi_kernel_write1(struct snd_rawmidi_substream *substream, - } - spin_lock_irqsave(&runtime->lock, flags); - } -- runtime->appl_ptr += count1; -- runtime->appl_ptr %= runtime->buffer_size; -- runtime->avail -= count1; - result += count1; - count -= count1; - } -diff --git a/sound/core/seq/oss/seq_oss_init.c b/sound/core/seq/oss/seq_oss_init.c -index b1221b2..6779e82b 100644 ---- a/sound/core/seq/oss/seq_oss_init.c -+++ b/sound/core/seq/oss/seq_oss_init.c -@@ -202,7 +202,7 @@ snd_seq_oss_open(struct file *file, int level) - - dp->index = i; - if (i >= SNDRV_SEQ_OSS_MAX_CLIENTS) { -- pr_err("ALSA: seq_oss: too many applications\n"); -+ pr_debug("ALSA: seq_oss: too many applications\n"); - rc = -ENOMEM; - goto _error; - } -diff --git a/sound/core/seq/oss/seq_oss_synth.c b/sound/core/seq/oss/seq_oss_synth.c -index 0f3b381..b16dbef 100644 ---- a/sound/core/seq/oss/seq_oss_synth.c -+++ b/sound/core/seq/oss/seq_oss_synth.c -@@ -308,7 +308,7 @@ snd_seq_oss_synth_cleanup(struct seq_oss_devinfo *dp) - struct seq_oss_synth *rec; - struct seq_oss_synthinfo *info; - -- if (snd_BUG_ON(dp->max_synthdev >= SNDRV_SEQ_OSS_MAX_SYNTH_DEVS)) -+ if (snd_BUG_ON(dp->max_synthdev > SNDRV_SEQ_OSS_MAX_SYNTH_DEVS)) - return; - for (i = 0; i < dp->max_synthdev; i++) { - info = &dp->synths[i]; -diff --git a/sound/core/seq/seq_clientmgr.c b/sound/core/seq/seq_clientmgr.c -index 13cfa81..58e79e0 100644 ---- a/sound/core/seq/seq_clientmgr.c -+++ b/sound/core/seq/seq_clientmgr.c -@@ -678,6 +678,9 @@ static int deliver_to_subscribers(struct snd_seq_client *client, - else - down_read(&grp->list_mutex); - list_for_each_entry(subs, &grp->list_head, src_list) { -+ /* both ports ready? */ -+ if (atomic_read(&subs->ref_count) != 2) -+ continue; - event->dest = subs->info.dest; - if (subs->info.flags & SNDRV_SEQ_PORT_SUBS_TIMESTAMP) - /* convert time according to flag with subscription */ -diff --git a/sound/core/seq/seq_ports.c b/sound/core/seq/seq_ports.c -index 55170a2..921fb2b 100644 ---- a/sound/core/seq/seq_ports.c -+++ b/sound/core/seq/seq_ports.c -@@ -173,10 +173,6 @@ struct snd_seq_client_port *snd_seq_create_port(struct snd_seq_client *client, - } - - /* */ --enum group_type { -- SRC_LIST, DEST_LIST --}; -- - static int subscribe_port(struct snd_seq_client *client, - struct snd_seq_client_port *port, - struct snd_seq_port_subs_info *grp, -@@ -203,6 +199,20 @@ static struct snd_seq_client_port *get_client_port(struct snd_seq_addr *addr, - return NULL; - } - -+static void delete_and_unsubscribe_port(struct snd_seq_client *client, -+ struct snd_seq_client_port *port, -+ struct snd_seq_subscribers *subs, -+ bool is_src, bool ack); -+ -+static inline struct snd_seq_subscribers * -+get_subscriber(struct list_head *p, bool is_src) -+{ -+ if (is_src) -+ return list_entry(p, struct snd_seq_subscribers, src_list); -+ else -+ return list_entry(p, struct snd_seq_subscribers, dest_list); -+} -+ - /* - * remove all subscribers on the list - * this is called from port_delete, for each src and dest list. -@@ -210,7 +220,7 @@ static struct snd_seq_client_port *get_client_port(struct snd_seq_addr *addr, - static void clear_subscriber_list(struct snd_seq_client *client, - struct snd_seq_client_port *port, - struct snd_seq_port_subs_info *grp, -- int grptype) -+ int is_src) - { - struct list_head *p, *n; - -@@ -219,15 +229,13 @@ static void clear_subscriber_list(struct snd_seq_client *client, - struct snd_seq_client *c; - struct snd_seq_client_port *aport; - -- if (grptype == SRC_LIST) { -- subs = list_entry(p, struct snd_seq_subscribers, src_list); -+ subs = get_subscriber(p, is_src); -+ if (is_src) - aport = get_client_port(&subs->info.dest, &c); -- } else { -- subs = list_entry(p, struct snd_seq_subscribers, dest_list); -+ else - aport = get_client_port(&subs->info.sender, &c); -- } -- list_del(p); -- unsubscribe_port(client, port, grp, &subs->info, 0); -+ delete_and_unsubscribe_port(client, port, subs, is_src, false); -+ - if (!aport) { - /* looks like the connected port is being deleted. - * we decrease the counter, and when both ports are deleted -@@ -235,21 +243,14 @@ static void clear_subscriber_list(struct snd_seq_client *client, - */ - if (atomic_dec_and_test(&subs->ref_count)) - kfree(subs); -- } else { -- /* ok we got the connected port */ -- struct snd_seq_port_subs_info *agrp; -- agrp = (grptype == SRC_LIST) ? &aport->c_dest : &aport->c_src; -- down_write(&agrp->list_mutex); -- if (grptype == SRC_LIST) -- list_del(&subs->dest_list); -- else -- list_del(&subs->src_list); -- up_write(&agrp->list_mutex); -- unsubscribe_port(c, aport, agrp, &subs->info, 1); -- kfree(subs); -- snd_seq_port_unlock(aport); -- snd_seq_client_unlock(c); -+ continue; - } -+ -+ /* ok we got the connected port */ -+ delete_and_unsubscribe_port(c, aport, subs, !is_src, true); -+ kfree(subs); -+ snd_seq_port_unlock(aport); -+ snd_seq_client_unlock(c); - } - } - -@@ -262,8 +263,8 @@ static int port_delete(struct snd_seq_client *client, - snd_use_lock_sync(&port->use_lock); - - /* clear subscribers info */ -- clear_subscriber_list(client, port, &port->c_src, SRC_LIST); -- clear_subscriber_list(client, port, &port->c_dest, DEST_LIST); -+ clear_subscriber_list(client, port, &port->c_src, true); -+ clear_subscriber_list(client, port, &port->c_dest, false); - - if (port->private_free) - port->private_free(port->private_data); -@@ -479,85 +480,120 @@ static int match_subs_info(struct snd_seq_port_subscribe *r, - return 0; - } - -- --/* connect two ports */ --int snd_seq_port_connect(struct snd_seq_client *connector, -- struct snd_seq_client *src_client, -- struct snd_seq_client_port *src_port, -- struct snd_seq_client *dest_client, -- struct snd_seq_client_port *dest_port, -- struct snd_seq_port_subscribe *info) -+static int check_and_subscribe_port(struct snd_seq_client *client, -+ struct snd_seq_client_port *port, -+ struct snd_seq_subscribers *subs, -+ bool is_src, bool exclusive, bool ack) - { -- struct snd_seq_port_subs_info *src = &src_port->c_src; -- struct snd_seq_port_subs_info *dest = &dest_port->c_dest; -- struct snd_seq_subscribers *subs, *s; -- int err, src_called = 0; -- unsigned long flags; -- int exclusive; -+ struct snd_seq_port_subs_info *grp; -+ struct list_head *p; -+ struct snd_seq_subscribers *s; -+ int err; - -- subs = kzalloc(sizeof(*subs), GFP_KERNEL); -- if (! subs) -- return -ENOMEM; -- -- subs->info = *info; -- atomic_set(&subs->ref_count, 2); -- -- down_write(&src->list_mutex); -- down_write_nested(&dest->list_mutex, SINGLE_DEPTH_NESTING); -- -- exclusive = info->flags & SNDRV_SEQ_PORT_SUBS_EXCLUSIVE ? 1 : 0; -+ grp = is_src ? &port->c_src : &port->c_dest; - err = -EBUSY; -+ down_write(&grp->list_mutex); - if (exclusive) { -- if (! list_empty(&src->list_head) || ! list_empty(&dest->list_head)) -+ if (!list_empty(&grp->list_head)) - goto __error; - } else { -- if (src->exclusive || dest->exclusive) -+ if (grp->exclusive) - goto __error; - /* check whether already exists */ -- list_for_each_entry(s, &src->list_head, src_list) { -- if (match_subs_info(info, &s->info)) -- goto __error; -- } -- list_for_each_entry(s, &dest->list_head, dest_list) { -- if (match_subs_info(info, &s->info)) -+ list_for_each(p, &grp->list_head) { -+ s = get_subscriber(p, is_src); -+ if (match_subs_info(&subs->info, &s->info)) - goto __error; - } - } - -- if ((err = subscribe_port(src_client, src_port, src, info, -- connector->number != src_client->number)) < 0) -- goto __error; -- src_called = 1; -- -- if ((err = subscribe_port(dest_client, dest_port, dest, info, -- connector->number != dest_client->number)) < 0) -+ err = subscribe_port(client, port, grp, &subs->info, ack); -+ if (err < 0) { -+ grp->exclusive = 0; - goto __error; -+ } - - /* add to list */ -- write_lock_irqsave(&src->list_lock, flags); -- // write_lock(&dest->list_lock); // no other lock yet -- list_add_tail(&subs->src_list, &src->list_head); -- list_add_tail(&subs->dest_list, &dest->list_head); -- // write_unlock(&dest->list_lock); // no other lock yet -- write_unlock_irqrestore(&src->list_lock, flags); -+ write_lock_irq(&grp->list_lock); -+ if (is_src) -+ list_add_tail(&subs->src_list, &grp->list_head); -+ else -+ list_add_tail(&subs->dest_list, &grp->list_head); -+ grp->exclusive = exclusive; -+ atomic_inc(&subs->ref_count); -+ write_unlock_irq(&grp->list_lock); -+ err = 0; -+ -+ __error: -+ up_write(&grp->list_mutex); -+ return err; -+} - -- src->exclusive = dest->exclusive = exclusive; -+static void delete_and_unsubscribe_port(struct snd_seq_client *client, -+ struct snd_seq_client_port *port, -+ struct snd_seq_subscribers *subs, -+ bool is_src, bool ack) -+{ -+ struct snd_seq_port_subs_info *grp; -+ -+ grp = is_src ? &port->c_src : &port->c_dest; -+ down_write(&grp->list_mutex); -+ write_lock_irq(&grp->list_lock); -+ if (is_src) -+ list_del(&subs->src_list); -+ else -+ list_del(&subs->dest_list); -+ grp->exclusive = 0; -+ write_unlock_irq(&grp->list_lock); -+ up_write(&grp->list_mutex); -+ -+ unsubscribe_port(client, port, grp, &subs->info, ack); -+} -+ -+/* connect two ports */ -+int snd_seq_port_connect(struct snd_seq_client *connector, -+ struct snd_seq_client *src_client, -+ struct snd_seq_client_port *src_port, -+ struct snd_seq_client *dest_client, -+ struct snd_seq_client_port *dest_port, -+ struct snd_seq_port_subscribe *info) -+{ -+ struct snd_seq_subscribers *subs; -+ bool exclusive; -+ int err; -+ -+ subs = kzalloc(sizeof(*subs), GFP_KERNEL); -+ if (!subs) -+ return -ENOMEM; -+ -+ subs->info = *info; -+ atomic_set(&subs->ref_count, 0); -+ INIT_LIST_HEAD(&subs->src_list); -+ INIT_LIST_HEAD(&subs->dest_list); -+ -+ exclusive = !!(info->flags & SNDRV_SEQ_PORT_SUBS_EXCLUSIVE); -+ -+ err = check_and_subscribe_port(src_client, src_port, subs, true, -+ exclusive, -+ connector->number != src_client->number); -+ if (err < 0) -+ goto error; -+ err = check_and_subscribe_port(dest_client, dest_port, subs, false, -+ exclusive, -+ connector->number != dest_client->number); -+ if (err < 0) -+ goto error_dest; - -- up_write(&dest->list_mutex); -- up_write(&src->list_mutex); - return 0; - -- __error: -- if (src_called) -- unsubscribe_port(src_client, src_port, src, info, -- connector->number != src_client->number); -+ error_dest: -+ delete_and_unsubscribe_port(src_client, src_port, subs, true, -+ connector->number != src_client->number); -+ error: - kfree(subs); -- up_write(&dest->list_mutex); -- up_write(&src->list_mutex); - return err; - } - -- - /* remove the connection */ - int snd_seq_port_disconnect(struct snd_seq_client *connector, - struct snd_seq_client *src_client, -@@ -567,37 +603,28 @@ int snd_seq_port_disconnect(struct snd_seq_client *connector, - struct snd_seq_port_subscribe *info) - { - struct snd_seq_port_subs_info *src = &src_port->c_src; -- struct snd_seq_port_subs_info *dest = &dest_port->c_dest; - struct snd_seq_subscribers *subs; - int err = -ENOENT; -- unsigned long flags; - - down_write(&src->list_mutex); -- down_write_nested(&dest->list_mutex, SINGLE_DEPTH_NESTING); -- - /* look for the connection */ - list_for_each_entry(subs, &src->list_head, src_list) { - if (match_subs_info(info, &subs->info)) { -- write_lock_irqsave(&src->list_lock, flags); -- // write_lock(&dest->list_lock); // no lock yet -- list_del(&subs->src_list); -- list_del(&subs->dest_list); -- // write_unlock(&dest->list_lock); -- write_unlock_irqrestore(&src->list_lock, flags); -- src->exclusive = dest->exclusive = 0; -- unsubscribe_port(src_client, src_port, src, info, -- connector->number != src_client->number); -- unsubscribe_port(dest_client, dest_port, dest, info, -- connector->number != dest_client->number); -- kfree(subs); -+ atomic_dec(&subs->ref_count); /* mark as not ready */ - err = 0; - break; - } - } -- -- up_write(&dest->list_mutex); - up_write(&src->list_mutex); -- return err; -+ if (err < 0) -+ return err; -+ -+ delete_and_unsubscribe_port(src_client, src_port, subs, true, -+ connector->number != src_client->number); -+ delete_and_unsubscribe_port(dest_client, dest_port, subs, false, -+ connector->number != dest_client->number); -+ kfree(subs); -+ return 0; - } - - -diff --git a/sound/core/seq/seq_timer.c b/sound/core/seq/seq_timer.c -index 82b220c..2931049 100644 ---- a/sound/core/seq/seq_timer.c -+++ b/sound/core/seq/seq_timer.c -@@ -90,6 +90,9 @@ void snd_seq_timer_delete(struct snd_seq_timer **tmr) - - void snd_seq_timer_defaults(struct snd_seq_timer * tmr) - { -+ unsigned long flags; -+ -+ spin_lock_irqsave(&tmr->lock, flags); - /* setup defaults */ - tmr->ppq = 96; /* 96 PPQ */ - tmr->tempo = 500000; /* 120 BPM */ -@@ -105,21 +108,25 @@ void snd_seq_timer_defaults(struct snd_seq_timer * tmr) - tmr->preferred_resolution = seq_default_timer_resolution; - - tmr->skew = tmr->skew_base = SKEW_BASE; -+ spin_unlock_irqrestore(&tmr->lock, flags); - } - --void snd_seq_timer_reset(struct snd_seq_timer * tmr) -+static void seq_timer_reset(struct snd_seq_timer *tmr) - { -- unsigned long flags; -- -- spin_lock_irqsave(&tmr->lock, flags); -- - /* reset time & songposition */ - tmr->cur_time.tv_sec = 0; - tmr->cur_time.tv_nsec = 0; - - tmr->tick.cur_tick = 0; - tmr->tick.fraction = 0; -+} -+ -+void snd_seq_timer_reset(struct snd_seq_timer *tmr) -+{ -+ unsigned long flags; - -+ spin_lock_irqsave(&tmr->lock, flags); -+ seq_timer_reset(tmr); - spin_unlock_irqrestore(&tmr->lock, flags); - } - -@@ -138,8 +145,11 @@ static void snd_seq_timer_interrupt(struct snd_timer_instance *timeri, - tmr = q->timer; - if (tmr == NULL) - return; -- if (!tmr->running) -+ spin_lock_irqsave(&tmr->lock, flags); -+ if (!tmr->running) { -+ spin_unlock_irqrestore(&tmr->lock, flags); - return; -+ } - - resolution *= ticks; - if (tmr->skew != tmr->skew_base) { -@@ -148,8 +158,6 @@ static void snd_seq_timer_interrupt(struct snd_timer_instance *timeri, - (((resolution & 0xffff) * tmr->skew) >> 16); - } - -- spin_lock_irqsave(&tmr->lock, flags); -- - /* update timer */ - snd_seq_inc_time_nsec(&tmr->cur_time, resolution); - -@@ -296,26 +304,30 @@ int snd_seq_timer_open(struct snd_seq_queue *q) - t->callback = snd_seq_timer_interrupt; - t->callback_data = q; - t->flags |= SNDRV_TIMER_IFLG_AUTO; -+ spin_lock_irq(&tmr->lock); - tmr->timeri = t; -+ spin_unlock_irq(&tmr->lock); - return 0; - } - - int snd_seq_timer_close(struct snd_seq_queue *q) - { - struct snd_seq_timer *tmr; -+ struct snd_timer_instance *t; - - tmr = q->timer; - if (snd_BUG_ON(!tmr)) - return -EINVAL; -- if (tmr->timeri) { -- snd_timer_stop(tmr->timeri); -- snd_timer_close(tmr->timeri); -- tmr->timeri = NULL; -- } -+ spin_lock_irq(&tmr->lock); -+ t = tmr->timeri; -+ tmr->timeri = NULL; -+ spin_unlock_irq(&tmr->lock); -+ if (t) -+ snd_timer_close(t); - return 0; - } - --int snd_seq_timer_stop(struct snd_seq_timer * tmr) -+static int seq_timer_stop(struct snd_seq_timer *tmr) - { - if (! tmr->timeri) - return -EINVAL; -@@ -326,6 +338,17 @@ int snd_seq_timer_stop(struct snd_seq_timer * tmr) - return 0; - } - -+int snd_seq_timer_stop(struct snd_seq_timer *tmr) -+{ -+ unsigned long flags; -+ int err; -+ -+ spin_lock_irqsave(&tmr->lock, flags); -+ err = seq_timer_stop(tmr); -+ spin_unlock_irqrestore(&tmr->lock, flags); -+ return err; -+} -+ - static int initialize_timer(struct snd_seq_timer *tmr) - { - struct snd_timer *t; -@@ -358,13 +381,13 @@ static int initialize_timer(struct snd_seq_timer *tmr) - return 0; - } - --int snd_seq_timer_start(struct snd_seq_timer * tmr) -+static int seq_timer_start(struct snd_seq_timer *tmr) - { - if (! tmr->timeri) - return -EINVAL; - if (tmr->running) -- snd_seq_timer_stop(tmr); -- snd_seq_timer_reset(tmr); -+ seq_timer_stop(tmr); -+ seq_timer_reset(tmr); - if (initialize_timer(tmr) < 0) - return -EINVAL; - snd_timer_start(tmr->timeri, tmr->ticks); -@@ -373,14 +396,25 @@ int snd_seq_timer_start(struct snd_seq_timer * tmr) - return 0; - } - --int snd_seq_timer_continue(struct snd_seq_timer * tmr) -+int snd_seq_timer_start(struct snd_seq_timer *tmr) -+{ -+ unsigned long flags; -+ int err; -+ -+ spin_lock_irqsave(&tmr->lock, flags); -+ err = seq_timer_start(tmr); -+ spin_unlock_irqrestore(&tmr->lock, flags); -+ return err; -+} -+ -+static int seq_timer_continue(struct snd_seq_timer *tmr) - { - if (! tmr->timeri) - return -EINVAL; - if (tmr->running) - return -EBUSY; - if (! tmr->initialized) { -- snd_seq_timer_reset(tmr); -+ seq_timer_reset(tmr); - if (initialize_timer(tmr) < 0) - return -EINVAL; - } -@@ -390,11 +424,24 @@ int snd_seq_timer_continue(struct snd_seq_timer * tmr) - return 0; - } - -+int snd_seq_timer_continue(struct snd_seq_timer *tmr) -+{ -+ unsigned long flags; -+ int err; -+ -+ spin_lock_irqsave(&tmr->lock, flags); -+ err = seq_timer_continue(tmr); -+ spin_unlock_irqrestore(&tmr->lock, flags); -+ return err; -+} -+ - /* return current 'real' time. use timeofday() to get better granularity. */ - snd_seq_real_time_t snd_seq_timer_get_cur_time(struct snd_seq_timer *tmr) - { - snd_seq_real_time_t cur_time; -+ unsigned long flags; - -+ spin_lock_irqsave(&tmr->lock, flags); - cur_time = tmr->cur_time; - if (tmr->running) { - struct timeval tm; -@@ -410,7 +457,7 @@ snd_seq_real_time_t snd_seq_timer_get_cur_time(struct snd_seq_timer *tmr) - } - snd_seq_sanity_real_time(&cur_time); - } -- -+ spin_unlock_irqrestore(&tmr->lock, flags); - return cur_time; - } - -diff --git a/sound/core/seq/seq_virmidi.c b/sound/core/seq/seq_virmidi.c -index 56e0f4cd..81134e0 100644 ---- a/sound/core/seq/seq_virmidi.c -+++ b/sound/core/seq/seq_virmidi.c -@@ -155,21 +155,26 @@ static void snd_virmidi_output_trigger(struct snd_rawmidi_substream *substream, - struct snd_virmidi *vmidi = substream->runtime->private_data; - int count, res; - unsigned char buf[32], *pbuf; -+ unsigned long flags; - - if (up) { - vmidi->trigger = 1; - if (vmidi->seq_mode == SNDRV_VIRMIDI_SEQ_DISPATCH && - !(vmidi->rdev->flags & SNDRV_VIRMIDI_SUBSCRIBE)) { -- snd_rawmidi_transmit_ack(substream, substream->runtime->buffer_size - substream->runtime->avail); -- return; /* ignored */ -+ while (snd_rawmidi_transmit(substream, buf, -+ sizeof(buf)) > 0) { -+ /* ignored */ -+ } -+ return; - } - if (vmidi->event.type != SNDRV_SEQ_EVENT_NONE) { - if (snd_seq_kernel_client_dispatch(vmidi->client, &vmidi->event, in_atomic(), 0) < 0) - return; - vmidi->event.type = SNDRV_SEQ_EVENT_NONE; - } -+ spin_lock_irqsave(&substream->runtime->lock, flags); - while (1) { -- count = snd_rawmidi_transmit_peek(substream, buf, sizeof(buf)); -+ count = __snd_rawmidi_transmit_peek(substream, buf, sizeof(buf)); - if (count <= 0) - break; - pbuf = buf; -@@ -179,16 +184,18 @@ static void snd_virmidi_output_trigger(struct snd_rawmidi_substream *substream, - snd_midi_event_reset_encode(vmidi->parser); - continue; - } -- snd_rawmidi_transmit_ack(substream, res); -+ __snd_rawmidi_transmit_ack(substream, res); - pbuf += res; - count -= res; - if (vmidi->event.type != SNDRV_SEQ_EVENT_NONE) { - if (snd_seq_kernel_client_dispatch(vmidi->client, &vmidi->event, in_atomic(), 0) < 0) -- return; -+ goto out; - vmidi->event.type = SNDRV_SEQ_EVENT_NONE; - } - } - } -+ out: -+ spin_unlock_irqrestore(&substream->runtime->lock, flags); - } else { - vmidi->trigger = 0; - } -@@ -254,9 +261,13 @@ static int snd_virmidi_output_open(struct snd_rawmidi_substream *substream) - */ - static int snd_virmidi_input_close(struct snd_rawmidi_substream *substream) - { -+ struct snd_virmidi_dev *rdev = substream->rmidi->private_data; - struct snd_virmidi *vmidi = substream->runtime->private_data; -- snd_midi_event_free(vmidi->parser); -+ -+ write_lock_irq(&rdev->filelist_lock); - list_del(&vmidi->list); -+ write_unlock_irq(&rdev->filelist_lock); -+ snd_midi_event_free(vmidi->parser); - substream->runtime->private_data = NULL; - kfree(vmidi); - return 0; -diff --git a/sound/core/timer.c b/sound/core/timer.c -index 0a049c4..f24c9fc 100644 ---- a/sound/core/timer.c -+++ b/sound/core/timer.c -@@ -305,8 +305,7 @@ int snd_timer_open(struct snd_timer_instance **ti, - return 0; - } - --static int _snd_timer_stop(struct snd_timer_instance *timeri, -- int keep_flag, int event); -+static int _snd_timer_stop(struct snd_timer_instance *timeri, int event); - - /* - * close a timer instance -@@ -348,7 +347,7 @@ int snd_timer_close(struct snd_timer_instance *timeri) - spin_unlock_irq(&timer->lock); - mutex_lock(®ister_mutex); - list_del(&timeri->open_list); -- if (timer && list_empty(&timer->open_list_head) && -+ if (list_empty(&timer->open_list_head) && - timer->hw.close) - timer->hw.close(timer); - /* remove slave links */ -@@ -423,7 +422,7 @@ static void snd_timer_notify1(struct snd_timer_instance *ti, int event) - spin_lock_irqsave(&timer->lock, flags); - list_for_each_entry(ts, &ti->slave_active_head, active_list) - if (ts->ccallback) -- ts->ccallback(ti, event + 100, &tstamp, resolution); -+ ts->ccallback(ts, event + 100, &tstamp, resolution); - spin_unlock_irqrestore(&timer->lock, flags); - } - -@@ -452,6 +451,10 @@ static int snd_timer_start_slave(struct snd_timer_instance *timeri) - unsigned long flags; - - spin_lock_irqsave(&slave_active_lock, flags); -+ if (timeri->flags & SNDRV_TIMER_IFLG_RUNNING) { -+ spin_unlock_irqrestore(&slave_active_lock, flags); -+ return -EBUSY; -+ } - timeri->flags |= SNDRV_TIMER_IFLG_RUNNING; - if (timeri->master && timeri->timer) { - spin_lock(&timeri->timer->lock); -@@ -476,7 +479,8 @@ int snd_timer_start(struct snd_timer_instance *timeri, unsigned int ticks) - return -EINVAL; - if (timeri->flags & SNDRV_TIMER_IFLG_SLAVE) { - result = snd_timer_start_slave(timeri); -- snd_timer_notify1(timeri, SNDRV_TIMER_EVENT_START); -+ if (result >= 0) -+ snd_timer_notify1(timeri, SNDRV_TIMER_EVENT_START); - return result; - } - timer = timeri->timer; -@@ -485,16 +489,22 @@ int snd_timer_start(struct snd_timer_instance *timeri, unsigned int ticks) - if (timer->card && timer->card->shutdown) - return -ENODEV; - spin_lock_irqsave(&timer->lock, flags); -+ if (timeri->flags & (SNDRV_TIMER_IFLG_RUNNING | -+ SNDRV_TIMER_IFLG_START)) { -+ result = -EBUSY; -+ goto unlock; -+ } - timeri->ticks = timeri->cticks = ticks; - timeri->pticks = 0; - result = snd_timer_start1(timer, timeri, ticks); -+ unlock: - spin_unlock_irqrestore(&timer->lock, flags); -- snd_timer_notify1(timeri, SNDRV_TIMER_EVENT_START); -+ if (result >= 0) -+ snd_timer_notify1(timeri, SNDRV_TIMER_EVENT_START); - return result; - } - --static int _snd_timer_stop(struct snd_timer_instance * timeri, -- int keep_flag, int event) -+static int _snd_timer_stop(struct snd_timer_instance *timeri, int event) - { - struct snd_timer *timer; - unsigned long flags; -@@ -503,19 +513,30 @@ static int _snd_timer_stop(struct snd_timer_instance * timeri, - return -ENXIO; - - if (timeri->flags & SNDRV_TIMER_IFLG_SLAVE) { -- if (!keep_flag) { -- spin_lock_irqsave(&slave_active_lock, flags); -- timeri->flags &= ~SNDRV_TIMER_IFLG_RUNNING; -- list_del_init(&timeri->ack_list); -- list_del_init(&timeri->active_list); -+ spin_lock_irqsave(&slave_active_lock, flags); -+ if (!(timeri->flags & SNDRV_TIMER_IFLG_RUNNING)) { - spin_unlock_irqrestore(&slave_active_lock, flags); -+ return -EBUSY; - } -+ if (timeri->timer) -+ spin_lock(&timeri->timer->lock); -+ timeri->flags &= ~SNDRV_TIMER_IFLG_RUNNING; -+ list_del_init(&timeri->ack_list); -+ list_del_init(&timeri->active_list); -+ if (timeri->timer) -+ spin_unlock(&timeri->timer->lock); -+ spin_unlock_irqrestore(&slave_active_lock, flags); - goto __end; - } - timer = timeri->timer; - if (!timer) - return -EINVAL; - spin_lock_irqsave(&timer->lock, flags); -+ if (!(timeri->flags & (SNDRV_TIMER_IFLG_RUNNING | -+ SNDRV_TIMER_IFLG_START))) { -+ spin_unlock_irqrestore(&timer->lock, flags); -+ return -EBUSY; -+ } - list_del_init(&timeri->ack_list); - list_del_init(&timeri->active_list); - if (timer->card && timer->card->shutdown) { -@@ -534,9 +555,7 @@ static int _snd_timer_stop(struct snd_timer_instance * timeri, - } - } - } -- if (!keep_flag) -- timeri->flags &= -- ~(SNDRV_TIMER_IFLG_RUNNING | SNDRV_TIMER_IFLG_START); -+ timeri->flags &= ~(SNDRV_TIMER_IFLG_RUNNING | SNDRV_TIMER_IFLG_START); - spin_unlock_irqrestore(&timer->lock, flags); - __end: - if (event != SNDRV_TIMER_EVENT_RESOLUTION) -@@ -555,7 +574,7 @@ int snd_timer_stop(struct snd_timer_instance *timeri) - unsigned long flags; - int err; - -- err = _snd_timer_stop(timeri, 0, SNDRV_TIMER_EVENT_STOP); -+ err = _snd_timer_stop(timeri, SNDRV_TIMER_EVENT_STOP); - if (err < 0) - return err; - timer = timeri->timer; -@@ -587,10 +606,15 @@ int snd_timer_continue(struct snd_timer_instance *timeri) - if (timer->card && timer->card->shutdown) - return -ENODEV; - spin_lock_irqsave(&timer->lock, flags); -+ if (timeri->flags & SNDRV_TIMER_IFLG_RUNNING) { -+ result = -EBUSY; -+ goto unlock; -+ } - if (!timeri->cticks) - timeri->cticks = 1; - timeri->pticks = 0; - result = snd_timer_start1(timer, timeri, timer->sticks); -+ unlock: - spin_unlock_irqrestore(&timer->lock, flags); - snd_timer_notify1(timeri, SNDRV_TIMER_EVENT_CONTINUE); - return result; -@@ -601,7 +625,7 @@ int snd_timer_continue(struct snd_timer_instance *timeri) - */ - int snd_timer_pause(struct snd_timer_instance * timeri) - { -- return _snd_timer_stop(timeri, 0, SNDRV_TIMER_EVENT_PAUSE); -+ return _snd_timer_stop(timeri, SNDRV_TIMER_EVENT_PAUSE); - } - - /* -@@ -724,8 +748,8 @@ void snd_timer_interrupt(struct snd_timer * timer, unsigned long ticks_left) - ti->cticks = ti->ticks; - } else { - ti->flags &= ~SNDRV_TIMER_IFLG_RUNNING; -- if (--timer->running) -- list_del_init(&ti->active_list); -+ --timer->running; -+ list_del_init(&ti->active_list); - } - if ((timer->hw.flags & SNDRV_TIMER_HW_TASKLET) || - (ti->flags & SNDRV_TIMER_IFLG_FAST)) -@@ -1900,6 +1924,7 @@ static ssize_t snd_timer_user_read(struct file *file, char __user *buffer, - { - struct snd_timer_user *tu; - long result = 0, unit; -+ int qhead; - int err = 0; - - tu = file->private_data; -@@ -1911,7 +1936,7 @@ static ssize_t snd_timer_user_read(struct file *file, char __user *buffer, - - if ((file->f_flags & O_NONBLOCK) != 0 || result > 0) { - err = -EAGAIN; -- break; -+ goto _error; - } - - set_current_state(TASK_INTERRUPTIBLE); -@@ -1926,42 +1951,37 @@ static ssize_t snd_timer_user_read(struct file *file, char __user *buffer, - - if (tu->disconnected) { - err = -ENODEV; -- break; -+ goto _error; - } - if (signal_pending(current)) { - err = -ERESTARTSYS; -- break; -+ goto _error; - } - } - -+ qhead = tu->qhead++; -+ tu->qhead %= tu->queue_size; - spin_unlock_irq(&tu->qlock); -- if (err < 0) -- goto _error; - - if (tu->tread) { -- if (copy_to_user(buffer, &tu->tqueue[tu->qhead++], -- sizeof(struct snd_timer_tread))) { -+ if (copy_to_user(buffer, &tu->tqueue[qhead], -+ sizeof(struct snd_timer_tread))) - err = -EFAULT; -- goto _error; -- } - } else { -- if (copy_to_user(buffer, &tu->queue[tu->qhead++], -- sizeof(struct snd_timer_read))) { -+ if (copy_to_user(buffer, &tu->queue[qhead], -+ sizeof(struct snd_timer_read))) - err = -EFAULT; -- goto _error; -- } - } - -- tu->qhead %= tu->queue_size; -- -- result += unit; -- buffer += unit; -- - spin_lock_irq(&tu->qlock); - tu->qused--; -+ if (err < 0) -+ goto _error; -+ result += unit; -+ buffer += unit; - } -- spin_unlock_irq(&tu->qlock); - _error: -+ spin_unlock_irq(&tu->qlock); - return result > 0 ? result : err; - } - -diff --git a/sound/drivers/dummy.c b/sound/drivers/dummy.c -index 016e451..a9f7a75 100644 ---- a/sound/drivers/dummy.c -+++ b/sound/drivers/dummy.c -@@ -109,6 +109,9 @@ struct dummy_timer_ops { - snd_pcm_uframes_t (*pointer)(struct snd_pcm_substream *); - }; - -+#define get_dummy_ops(substream) \ -+ (*(const struct dummy_timer_ops **)(substream)->runtime->private_data) -+ - struct dummy_model { - const char *name; - int (*playback_constraints)(struct snd_pcm_runtime *runtime); -@@ -137,7 +140,6 @@ struct snd_dummy { - int iobox; - struct snd_kcontrol *cd_volume_ctl; - struct snd_kcontrol *cd_switch_ctl; -- const struct dummy_timer_ops *timer_ops; - }; - - /* -@@ -231,6 +233,8 @@ static struct dummy_model *dummy_models[] = { - */ - - struct dummy_systimer_pcm { -+ /* ops must be the first item */ -+ const struct dummy_timer_ops *timer_ops; - spinlock_t lock; - struct timer_list timer; - unsigned long base_time; -@@ -366,6 +370,8 @@ static struct dummy_timer_ops dummy_systimer_ops = { - */ - - struct dummy_hrtimer_pcm { -+ /* ops must be the first item */ -+ const struct dummy_timer_ops *timer_ops; - ktime_t base_time; - ktime_t period_time; - atomic_t running; -@@ -492,31 +498,25 @@ static struct dummy_timer_ops dummy_hrtimer_ops = { - - static int dummy_pcm_trigger(struct snd_pcm_substream *substream, int cmd) - { -- struct snd_dummy *dummy = snd_pcm_substream_chip(substream); -- - switch (cmd) { - case SNDRV_PCM_TRIGGER_START: - case SNDRV_PCM_TRIGGER_RESUME: -- return dummy->timer_ops->start(substream); -+ return get_dummy_ops(substream)->start(substream); - case SNDRV_PCM_TRIGGER_STOP: - case SNDRV_PCM_TRIGGER_SUSPEND: -- return dummy->timer_ops->stop(substream); -+ return get_dummy_ops(substream)->stop(substream); - } - return -EINVAL; - } - - static int dummy_pcm_prepare(struct snd_pcm_substream *substream) - { -- struct snd_dummy *dummy = snd_pcm_substream_chip(substream); -- -- return dummy->timer_ops->prepare(substream); -+ return get_dummy_ops(substream)->prepare(substream); - } - - static snd_pcm_uframes_t dummy_pcm_pointer(struct snd_pcm_substream *substream) - { -- struct snd_dummy *dummy = snd_pcm_substream_chip(substream); -- -- return dummy->timer_ops->pointer(substream); -+ return get_dummy_ops(substream)->pointer(substream); - } - - static struct snd_pcm_hardware dummy_pcm_hardware = { -@@ -562,17 +562,19 @@ static int dummy_pcm_open(struct snd_pcm_substream *substream) - struct snd_dummy *dummy = snd_pcm_substream_chip(substream); - struct dummy_model *model = dummy->model; - struct snd_pcm_runtime *runtime = substream->runtime; -+ const struct dummy_timer_ops *ops; - int err; - -- dummy->timer_ops = &dummy_systimer_ops; -+ ops = &dummy_systimer_ops; - #ifdef CONFIG_HIGH_RES_TIMERS - if (hrtimer) -- dummy->timer_ops = &dummy_hrtimer_ops; -+ ops = &dummy_hrtimer_ops; - #endif - -- err = dummy->timer_ops->create(substream); -+ err = ops->create(substream); - if (err < 0) - return err; -+ get_dummy_ops(substream) = ops; - - runtime->hw = dummy->pcm_hw; - if (substream->pcm->device & 1) { -@@ -594,7 +596,7 @@ static int dummy_pcm_open(struct snd_pcm_substream *substream) - err = model->capture_constraints(substream->runtime); - } - if (err < 0) { -- dummy->timer_ops->free(substream); -+ get_dummy_ops(substream)->free(substream); - return err; - } - return 0; -@@ -602,8 +604,7 @@ static int dummy_pcm_open(struct snd_pcm_substream *substream) - - static int dummy_pcm_close(struct snd_pcm_substream *substream) - { -- struct snd_dummy *dummy = snd_pcm_substream_chip(substream); -- dummy->timer_ops->free(substream); -+ get_dummy_ops(substream)->free(substream); - return 0; - } - -diff --git a/sound/firewire/bebob/bebob_stream.c b/sound/firewire/bebob/bebob_stream.c -index 926e5dc..5022c9b 100644 ---- a/sound/firewire/bebob/bebob_stream.c -+++ b/sound/firewire/bebob/bebob_stream.c -@@ -47,14 +47,16 @@ static const unsigned int bridgeco_freq_table[] = { - [6] = 0x07, - }; - --static unsigned int --get_formation_index(unsigned int rate) -+static int -+get_formation_index(unsigned int rate, unsigned int *index) - { - unsigned int i; - - for (i = 0; i < ARRAY_SIZE(snd_bebob_rate_table); i++) { -- if (snd_bebob_rate_table[i] == rate) -- return i; -+ if (snd_bebob_rate_table[i] == rate) { -+ *index = i; -+ return 0; -+ } - } - return -EINVAL; - } -@@ -425,7 +427,9 @@ make_both_connections(struct snd_bebob *bebob, unsigned int rate) - goto end; - - /* confirm params for both streams */ -- index = get_formation_index(rate); -+ err = get_formation_index(rate, &index); -+ if (err < 0) -+ goto end; - pcm_channels = bebob->tx_stream_formations[index].pcm; - midi_channels = bebob->tx_stream_formations[index].midi; - err = amdtp_am824_set_parameters(&bebob->tx_stream, rate, -diff --git a/sound/isa/Kconfig b/sound/isa/Kconfig -index 0216475..37adcc6 100644 ---- a/sound/isa/Kconfig -+++ b/sound/isa/Kconfig -@@ -3,6 +3,7 @@ - config SND_WSS_LIB - tristate - select SND_PCM -+ select SND_TIMER - - config SND_SB_COMMON - tristate -@@ -42,6 +43,7 @@ config SND_AD1816A - select SND_OPL3_LIB - select SND_MPU401_UART - select SND_PCM -+ select SND_TIMER - help - Say Y here to include support for Analog Devices SoundPort - AD1816A or compatible sound chips. -@@ -209,6 +211,7 @@ config SND_GUSCLASSIC - tristate "Gravis UltraSound Classic" - select SND_RAWMIDI - select SND_PCM -+ select SND_TIMER - help - Say Y here to include support for Gravis UltraSound Classic - soundcards. -@@ -221,6 +224,7 @@ config SND_GUSEXTREME - select SND_OPL3_LIB - select SND_MPU401_UART - select SND_PCM -+ select SND_TIMER - help - Say Y here to include support for Gravis UltraSound Extreme - soundcards. -diff --git a/sound/pci/Kconfig b/sound/pci/Kconfig -index 656ce39..8f6594a 100644 ---- a/sound/pci/Kconfig -+++ b/sound/pci/Kconfig -@@ -155,6 +155,7 @@ config SND_AZT3328 - select SND_PCM - select SND_RAWMIDI - select SND_AC97_CODEC -+ select SND_TIMER - depends on ZONE_DMA - help - Say Y here to include support for Aztech AZF3328 (PCI168) -@@ -463,6 +464,7 @@ config SND_EMU10K1 - select SND_HWDEP - select SND_RAWMIDI - select SND_AC97_CODEC -+ select SND_TIMER - depends on ZONE_DMA - help - Say Y to include support for Sound Blaster PCI 512, Live!, -@@ -889,6 +891,7 @@ config SND_YMFPCI - select SND_OPL3_LIB - select SND_MPU401_UART - select SND_AC97_CODEC -+ select SND_TIMER - help - Say Y here to include support for Yamaha PCI audio chips - - YMF724, YMF724F, YMF740, YMF740C, YMF744, YMF754. -diff --git a/sound/pci/hda/hda_generic.c b/sound/pci/hda/hda_generic.c -index c6e8a65..5c4fa8e 100644 ---- a/sound/pci/hda/hda_generic.c -+++ b/sound/pci/hda/hda_generic.c -@@ -771,9 +771,6 @@ static void activate_amp(struct hda_codec *codec, hda_nid_t nid, int dir, - unsigned int caps; - unsigned int mask, val; - -- if (!enable && is_active_nid(codec, nid, dir, idx_to_check)) -- return; -- - caps = query_amp_caps(codec, nid, dir); - val = get_amp_val_to_activate(codec, nid, dir, caps, enable); - mask = get_amp_mask_to_modify(codec, nid, dir, idx_to_check, caps); -@@ -784,12 +781,22 @@ static void activate_amp(struct hda_codec *codec, hda_nid_t nid, int dir, - update_amp(codec, nid, dir, idx, mask, val); - } - -+static void check_and_activate_amp(struct hda_codec *codec, hda_nid_t nid, -+ int dir, int idx, int idx_to_check, -+ bool enable) -+{ -+ /* check whether the given amp is still used by others */ -+ if (!enable && is_active_nid(codec, nid, dir, idx_to_check)) -+ return; -+ activate_amp(codec, nid, dir, idx, idx_to_check, enable); -+} -+ - static void activate_amp_out(struct hda_codec *codec, struct nid_path *path, - int i, bool enable) - { - hda_nid_t nid = path->path[i]; - init_amp(codec, nid, HDA_OUTPUT, 0); -- activate_amp(codec, nid, HDA_OUTPUT, 0, 0, enable); -+ check_and_activate_amp(codec, nid, HDA_OUTPUT, 0, 0, enable); - } - - static void activate_amp_in(struct hda_codec *codec, struct nid_path *path, -@@ -817,9 +824,16 @@ static void activate_amp_in(struct hda_codec *codec, struct nid_path *path, - * when aa-mixer is available, we need to enable the path as well - */ - for (n = 0; n < nums; n++) { -- if (n != idx && (!add_aamix || conn[n] != spec->mixer_merge_nid)) -- continue; -- activate_amp(codec, nid, HDA_INPUT, n, idx, enable); -+ if (n != idx) { -+ if (conn[n] != spec->mixer_merge_nid) -+ continue; -+ /* when aamix is disabled, force to off */ -+ if (!add_aamix) { -+ activate_amp(codec, nid, HDA_INPUT, n, n, false); -+ continue; -+ } -+ } -+ check_and_activate_amp(codec, nid, HDA_INPUT, n, idx, enable); - } - } - -@@ -1580,6 +1594,12 @@ static bool map_singles(struct hda_codec *codec, int outs, - return found; - } - -+static inline bool has_aamix_out_paths(struct hda_gen_spec *spec) -+{ -+ return spec->aamix_out_paths[0] || spec->aamix_out_paths[1] || -+ spec->aamix_out_paths[2]; -+} -+ - /* create a new path including aamix if available, and return its index */ - static int check_aamix_out_path(struct hda_codec *codec, int path_idx) - { -@@ -2422,25 +2442,51 @@ static void update_aamix_paths(struct hda_codec *codec, bool do_mix, - } - } - -+/* re-initialize the output paths; only called from loopback_mixing_put() */ -+static void update_output_paths(struct hda_codec *codec, int num_outs, -+ const int *paths) -+{ -+ struct hda_gen_spec *spec = codec->spec; -+ struct nid_path *path; -+ int i; -+ -+ for (i = 0; i < num_outs; i++) { -+ path = snd_hda_get_path_from_idx(codec, paths[i]); -+ if (path) -+ snd_hda_activate_path(codec, path, path->active, -+ spec->aamix_mode); -+ } -+} -+ - static int loopback_mixing_put(struct snd_kcontrol *kcontrol, - struct snd_ctl_elem_value *ucontrol) - { - struct hda_codec *codec = snd_kcontrol_chip(kcontrol); - struct hda_gen_spec *spec = codec->spec; -+ const struct auto_pin_cfg *cfg = &spec->autocfg; - unsigned int val = ucontrol->value.enumerated.item[0]; - - if (val == spec->aamix_mode) - return 0; - spec->aamix_mode = val; -- update_aamix_paths(codec, val, spec->out_paths[0], -- spec->aamix_out_paths[0], -- spec->autocfg.line_out_type); -- update_aamix_paths(codec, val, spec->hp_paths[0], -- spec->aamix_out_paths[1], -- AUTO_PIN_HP_OUT); -- update_aamix_paths(codec, val, spec->speaker_paths[0], -- spec->aamix_out_paths[2], -- AUTO_PIN_SPEAKER_OUT); -+ if (has_aamix_out_paths(spec)) { -+ update_aamix_paths(codec, val, spec->out_paths[0], -+ spec->aamix_out_paths[0], -+ cfg->line_out_type); -+ update_aamix_paths(codec, val, spec->hp_paths[0], -+ spec->aamix_out_paths[1], -+ AUTO_PIN_HP_OUT); -+ update_aamix_paths(codec, val, spec->speaker_paths[0], -+ spec->aamix_out_paths[2], -+ AUTO_PIN_SPEAKER_OUT); -+ } else { -+ update_output_paths(codec, cfg->line_outs, spec->out_paths); -+ if (cfg->line_out_type != AUTO_PIN_HP_OUT) -+ update_output_paths(codec, cfg->hp_outs, spec->hp_paths); -+ if (cfg->line_out_type != AUTO_PIN_SPEAKER_OUT) -+ update_output_paths(codec, cfg->speaker_outs, -+ spec->speaker_paths); -+ } - return 1; - } - -@@ -2458,12 +2504,13 @@ static int create_loopback_mixing_ctl(struct hda_codec *codec) - - if (!spec->mixer_nid) - return 0; -- if (!(spec->aamix_out_paths[0] || spec->aamix_out_paths[1] || -- spec->aamix_out_paths[2])) -- return 0; - if (!snd_hda_gen_add_kctl(spec, NULL, &loopback_mixing_enum)) - return -ENOMEM; - spec->have_aamix_ctl = 1; -+ /* if no explicit aamix path is present (e.g. for Realtek codecs), -+ * enable aamix as default -- just for compatibility -+ */ -+ spec->aamix_mode = !has_aamix_out_paths(spec); - return 0; - } - -@@ -3998,9 +4045,9 @@ static void pin_power_callback(struct hda_codec *codec, - struct hda_jack_callback *jack, - bool on) - { -- if (jack && jack->tbl->nid) -+ if (jack && jack->nid) - sync_power_state_change(codec, -- set_pin_power_jack(codec, jack->tbl->nid, on)); -+ set_pin_power_jack(codec, jack->nid, on)); - } - - /* callback only doing power up -- called at first */ -@@ -5664,6 +5711,8 @@ static void init_aamix_paths(struct hda_codec *codec) - - if (!spec->have_aamix_ctl) - return; -+ if (!has_aamix_out_paths(spec)) -+ return; - update_aamix_paths(codec, spec->aamix_mode, spec->out_paths[0], - spec->aamix_out_paths[0], - spec->autocfg.line_out_type); -diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c -index 614baff..02a86ba 100644 ---- a/sound/pci/hda/hda_intel.c -+++ b/sound/pci/hda/hda_intel.c -@@ -90,6 +90,8 @@ enum { - #define NVIDIA_HDA_ENABLE_COHBIT 0x01 - - /* Defines for Intel SCH HDA snoop control */ -+#define INTEL_HDA_CGCTL 0x48 -+#define INTEL_HDA_CGCTL_MISCBDCGE (0x1 << 6) - #define INTEL_SCH_HDA_DEVC 0x78 - #define INTEL_SCH_HDA_DEVC_NOSNOOP (0x1<<11) - -@@ -528,10 +530,21 @@ static void hda_intel_init_chip(struct azx *chip, bool full_reset) - { - struct hdac_bus *bus = azx_bus(chip); - struct pci_dev *pci = chip->pci; -+ u32 val; - - if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL) - snd_hdac_set_codec_wakeup(bus, true); -+ if (IS_BROXTON(pci)) { -+ pci_read_config_dword(pci, INTEL_HDA_CGCTL, &val); -+ val = val & ~INTEL_HDA_CGCTL_MISCBDCGE; -+ pci_write_config_dword(pci, INTEL_HDA_CGCTL, val); -+ } - azx_init_chip(chip, full_reset); -+ if (IS_BROXTON(pci)) { -+ pci_read_config_dword(pci, INTEL_HDA_CGCTL, &val); -+ val = val | INTEL_HDA_CGCTL_MISCBDCGE; -+ pci_write_config_dword(pci, INTEL_HDA_CGCTL, val); -+ } - if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL) - snd_hdac_set_codec_wakeup(bus, false); - -diff --git a/sound/pci/hda/hda_jack.c b/sound/pci/hda/hda_jack.c -index c945e25..a33234e 100644 ---- a/sound/pci/hda/hda_jack.c -+++ b/sound/pci/hda/hda_jack.c -@@ -259,7 +259,7 @@ snd_hda_jack_detect_enable_callback(struct hda_codec *codec, hda_nid_t nid, - if (!callback) - return ERR_PTR(-ENOMEM); - callback->func = func; -- callback->tbl = jack; -+ callback->nid = jack->nid; - callback->next = jack->callback; - jack->callback = callback; - } -diff --git a/sound/pci/hda/hda_jack.h b/sound/pci/hda/hda_jack.h -index 858708a..e9814c0 100644 ---- a/sound/pci/hda/hda_jack.h -+++ b/sound/pci/hda/hda_jack.h -@@ -21,7 +21,7 @@ struct hda_jack_callback; - typedef void (*hda_jack_callback_fn) (struct hda_codec *, struct hda_jack_callback *); - - struct hda_jack_callback { -- struct hda_jack_tbl *tbl; -+ hda_nid_t nid; - hda_jack_callback_fn func; - unsigned int private_data; /* arbitrary data */ - struct hda_jack_callback *next; -diff --git a/sound/pci/hda/patch_ca0132.c b/sound/pci/hda/patch_ca0132.c -index 4ef2259..9ceb2bc 100644 ---- a/sound/pci/hda/patch_ca0132.c -+++ b/sound/pci/hda/patch_ca0132.c -@@ -4427,13 +4427,16 @@ static void ca0132_process_dsp_response(struct hda_codec *codec, - static void hp_callback(struct hda_codec *codec, struct hda_jack_callback *cb) - { - struct ca0132_spec *spec = codec->spec; -+ struct hda_jack_tbl *tbl; - - /* Delay enabling the HP amp, to let the mic-detection - * state machine run. - */ - cancel_delayed_work_sync(&spec->unsol_hp_work); - schedule_delayed_work(&spec->unsol_hp_work, msecs_to_jiffies(500)); -- cb->tbl->block_report = 1; -+ tbl = snd_hda_jack_tbl_get(codec, cb->nid); -+ if (tbl) -+ tbl->block_report = 1; - } - - static void amic_callback(struct hda_codec *codec, struct hda_jack_callback *cb) -diff --git a/sound/pci/hda/patch_cirrus.c b/sound/pci/hda/patch_cirrus.c -index a12ae8a..c1c855a 100644 ---- a/sound/pci/hda/patch_cirrus.c -+++ b/sound/pci/hda/patch_cirrus.c -@@ -614,6 +614,7 @@ enum { - CS4208_MAC_AUTO, - CS4208_MBA6, - CS4208_MBP11, -+ CS4208_MACMINI, - CS4208_GPIO0, - }; - -@@ -621,6 +622,7 @@ static const struct hda_model_fixup cs4208_models[] = { - { .id = CS4208_GPIO0, .name = "gpio0" }, - { .id = CS4208_MBA6, .name = "mba6" }, - { .id = CS4208_MBP11, .name = "mbp11" }, -+ { .id = CS4208_MACMINI, .name = "macmini" }, - {} - }; - -@@ -632,6 +634,7 @@ static const struct snd_pci_quirk cs4208_fixup_tbl[] = { - /* codec SSID matching */ - static const struct snd_pci_quirk cs4208_mac_fixup_tbl[] = { - SND_PCI_QUIRK(0x106b, 0x5e00, "MacBookPro 11,2", CS4208_MBP11), -+ SND_PCI_QUIRK(0x106b, 0x6c00, "MacMini 7,1", CS4208_MACMINI), - SND_PCI_QUIRK(0x106b, 0x7100, "MacBookAir 6,1", CS4208_MBA6), - SND_PCI_QUIRK(0x106b, 0x7200, "MacBookAir 6,2", CS4208_MBA6), - SND_PCI_QUIRK(0x106b, 0x7b00, "MacBookPro 12,1", CS4208_MBP11), -@@ -666,6 +669,24 @@ static void cs4208_fixup_mac(struct hda_codec *codec, - snd_hda_apply_fixup(codec, action); - } - -+/* MacMini 7,1 has the inverted jack detection */ -+static void cs4208_fixup_macmini(struct hda_codec *codec, -+ const struct hda_fixup *fix, int action) -+{ -+ static const struct hda_pintbl pincfgs[] = { -+ { 0x18, 0x00ab9150 }, /* mic (audio-in) jack: disable detect */ -+ { 0x21, 0x004be140 }, /* SPDIF: disable detect */ -+ { } -+ }; -+ -+ if (action == HDA_FIXUP_ACT_PRE_PROBE) { -+ /* HP pin (0x10) has an inverted detection */ -+ codec->inv_jack_detect = 1; -+ /* disable the bogus Mic and SPDIF jack detections */ -+ snd_hda_apply_pincfgs(codec, pincfgs); -+ } -+} -+ - static int cs4208_spdif_sw_put(struct snd_kcontrol *kcontrol, - struct snd_ctl_elem_value *ucontrol) - { -@@ -709,6 +730,12 @@ static const struct hda_fixup cs4208_fixups[] = { - .chained = true, - .chain_id = CS4208_GPIO0, - }, -+ [CS4208_MACMINI] = { -+ .type = HDA_FIXUP_FUNC, -+ .v.func = cs4208_fixup_macmini, -+ .chained = true, -+ .chain_id = CS4208_GPIO0, -+ }, - [CS4208_GPIO0] = { - .type = HDA_FIXUP_FUNC, - .v.func = cs4208_fixup_gpio0, -diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c -index 4b6fb66..70c9456 100644 ---- a/sound/pci/hda/patch_hdmi.c -+++ b/sound/pci/hda/patch_hdmi.c -@@ -438,7 +438,8 @@ static int hdmi_eld_ctl_get(struct snd_kcontrol *kcontrol, - eld = &per_pin->sink_eld; - - mutex_lock(&per_pin->lock); -- if (eld->eld_size > ARRAY_SIZE(ucontrol->value.bytes.data)) { -+ if (eld->eld_size > ARRAY_SIZE(ucontrol->value.bytes.data) || -+ eld->eld_size > ELD_MAX_SIZE) { - mutex_unlock(&per_pin->lock); - snd_BUG(); - return -EINVAL; -@@ -1183,7 +1184,7 @@ static void check_presence_and_report(struct hda_codec *codec, hda_nid_t nid) - static void jack_callback(struct hda_codec *codec, - struct hda_jack_callback *jack) - { -- check_presence_and_report(codec, jack->tbl->nid); -+ check_presence_and_report(codec, jack->nid); - } - - static void hdmi_intrinsic_event(struct hda_codec *codec, unsigned int res) -diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c -index 3375324..efd4980 100644 ---- a/sound/pci/hda/patch_realtek.c -+++ b/sound/pci/hda/patch_realtek.c -@@ -282,7 +282,7 @@ static void alc_update_knob_master(struct hda_codec *codec, - uctl = kzalloc(sizeof(*uctl), GFP_KERNEL); - if (!uctl) - return; -- val = snd_hda_codec_read(codec, jack->tbl->nid, 0, -+ val = snd_hda_codec_read(codec, jack->nid, 0, - AC_VERB_GET_VOLUME_KNOB_CONTROL, 0); - val &= HDA_AMP_VOLMASK; - uctl->value.integer.value[0] = val; -@@ -327,6 +327,7 @@ static void alc_fill_eapd_coef(struct hda_codec *codec) - case 0x10ec0292: - alc_update_coef_idx(codec, 0x4, 1<<15, 0); - break; -+ case 0x10ec0225: - case 0x10ec0233: - case 0x10ec0255: - case 0x10ec0256: -@@ -900,6 +901,7 @@ static struct alc_codec_rename_pci_table rename_pci_tbl[] = { - { 0x10ec0899, 0x1028, 0, "ALC3861" }, - { 0x10ec0298, 0x1028, 0, "ALC3266" }, - { 0x10ec0256, 0x1028, 0, "ALC3246" }, -+ { 0x10ec0225, 0x1028, 0, "ALC3253" }, - { 0x10ec0670, 0x1025, 0, "ALC669X" }, - { 0x10ec0676, 0x1025, 0, "ALC679X" }, - { 0x10ec0282, 0x1043, 0, "ALC3229" }, -@@ -1785,7 +1787,6 @@ enum { - ALC882_FIXUP_NO_PRIMARY_HP, - ALC887_FIXUP_ASUS_BASS, - ALC887_FIXUP_BASS_CHMAP, -- ALC882_FIXUP_DISABLE_AAMIX, - }; - - static void alc889_fixup_coef(struct hda_codec *codec, -@@ -1947,8 +1948,6 @@ static void alc882_fixup_no_primary_hp(struct hda_codec *codec, - - static void alc_fixup_bass_chmap(struct hda_codec *codec, - const struct hda_fixup *fix, int action); --static void alc_fixup_disable_aamix(struct hda_codec *codec, -- const struct hda_fixup *fix, int action); - - static const struct hda_fixup alc882_fixups[] = { - [ALC882_FIXUP_ABIT_AW9D_MAX] = { -@@ -2186,10 +2185,6 @@ static const struct hda_fixup alc882_fixups[] = { - .type = HDA_FIXUP_FUNC, - .v.func = alc_fixup_bass_chmap, - }, -- [ALC882_FIXUP_DISABLE_AAMIX] = { -- .type = HDA_FIXUP_FUNC, -- .v.func = alc_fixup_disable_aamix, -- }, - }; - - static const struct snd_pci_quirk alc882_fixup_tbl[] = { -@@ -2228,6 +2223,7 @@ static const struct snd_pci_quirk alc882_fixup_tbl[] = { - SND_PCI_QUIRK(0x104d, 0x9047, "Sony Vaio TT", ALC889_FIXUP_VAIO_TT), - SND_PCI_QUIRK(0x104d, 0x905a, "Sony Vaio Z", ALC882_FIXUP_NO_PRIMARY_HP), - SND_PCI_QUIRK(0x104d, 0x9043, "Sony Vaio VGC-LN51JGB", ALC882_FIXUP_NO_PRIMARY_HP), -+ SND_PCI_QUIRK(0x104d, 0x9044, "Sony VAIO AiO", ALC882_FIXUP_NO_PRIMARY_HP), - - /* All Apple entries are in codec SSIDs */ - SND_PCI_QUIRK(0x106b, 0x00a0, "MacBookPro 3,1", ALC889_FIXUP_MBP_VREF), -@@ -2257,7 +2253,6 @@ static const struct snd_pci_quirk alc882_fixup_tbl[] = { - SND_PCI_QUIRK(0x1462, 0x7350, "MSI-7350", ALC889_FIXUP_CD), - SND_PCI_QUIRK_VENDOR(0x1462, "MSI", ALC882_FIXUP_GPIO3), - SND_PCI_QUIRK(0x1458, 0xa002, "Gigabyte EP45-DS3/Z87X-UD3H", ALC889_FIXUP_FRONT_HP_NO_PRESENCE), -- SND_PCI_QUIRK(0x1458, 0xa182, "Gigabyte Z170X-UD3", ALC882_FIXUP_DISABLE_AAMIX), - SND_PCI_QUIRK(0x147b, 0x107a, "Abit AW9D-MAX", ALC882_FIXUP_ABIT_AW9D_MAX), - SND_PCI_QUIRK_VENDOR(0x1558, "Clevo laptop", ALC882_FIXUP_EAPD), - SND_PCI_QUIRK(0x161f, 0x2054, "Medion laptop", ALC883_FIXUP_EAPD), -@@ -2651,6 +2646,7 @@ enum { - ALC269_TYPE_ALC298, - ALC269_TYPE_ALC255, - ALC269_TYPE_ALC256, -+ ALC269_TYPE_ALC225, - }; - - /* -@@ -2680,6 +2676,7 @@ static int alc269_parse_auto_config(struct hda_codec *codec) - case ALC269_TYPE_ALC298: - case ALC269_TYPE_ALC255: - case ALC269_TYPE_ALC256: -+ case ALC269_TYPE_ALC225: - ssids = alc269_ssids; - break; - default: -@@ -3658,6 +3655,16 @@ static void alc_headset_mode_unplugged(struct hda_codec *codec) - WRITE_COEF(0xb7, 0x802b), - {} - }; -+ static struct coef_fw coef0225[] = { -+ UPDATE_COEF(0x4a, 1<<8, 0), -+ UPDATE_COEFEX(0x57, 0x05, 1<<14, 0), -+ UPDATE_COEF(0x63, 3<<14, 3<<14), -+ UPDATE_COEF(0x4a, 3<<4, 2<<4), -+ UPDATE_COEF(0x4a, 3<<10, 3<<10), -+ UPDATE_COEF(0x45, 0x3f<<10, 0x34<<10), -+ UPDATE_COEF(0x4a, 3<<10, 0), -+ {} -+ }; - - switch (codec->core.vendor_id) { - case 0x10ec0255: -@@ -3682,6 +3689,9 @@ static void alc_headset_mode_unplugged(struct hda_codec *codec) - case 0x10ec0668: - alc_process_coef_fw(codec, coef0668); - break; -+ case 0x10ec0225: -+ alc_process_coef_fw(codec, coef0225); -+ break; - } - codec_dbg(codec, "Headset jack set to unplugged mode.\n"); - } -@@ -3727,6 +3737,13 @@ static void alc_headset_mode_mic_in(struct hda_codec *codec, hda_nid_t hp_pin, - UPDATE_COEF(0xc3, 0, 1<<12), - {} - }; -+ static struct coef_fw coef0225[] = { -+ UPDATE_COEFEX(0x57, 0x05, 1<<14, 1<<14), -+ UPDATE_COEF(0x4a, 3<<4, 2<<4), -+ UPDATE_COEF(0x63, 3<<14, 0), -+ {} -+ }; -+ - - switch (codec->core.vendor_id) { - case 0x10ec0255: -@@ -3772,6 +3789,12 @@ static void alc_headset_mode_mic_in(struct hda_codec *codec, hda_nid_t hp_pin, - alc_process_coef_fw(codec, coef0688); - snd_hda_set_pin_ctl_cache(codec, mic_pin, PIN_VREF50); - break; -+ case 0x10ec0225: -+ alc_update_coef_idx(codec, 0x45, 0x3f<<10, 0x31<<10); -+ snd_hda_set_pin_ctl_cache(codec, hp_pin, 0); -+ alc_process_coef_fw(codec, coef0225); -+ snd_hda_set_pin_ctl_cache(codec, mic_pin, PIN_VREF50); -+ break; - } - codec_dbg(codec, "Headset jack set to mic-in mode.\n"); - } -@@ -3884,6 +3907,13 @@ static void alc_headset_mode_ctia(struct hda_codec *codec) - WRITE_COEF(0xc3, 0x0000), - {} - }; -+ static struct coef_fw coef0225[] = { -+ UPDATE_COEF(0x45, 0x3f<<10, 0x35<<10), -+ UPDATE_COEF(0x49, 1<<8, 1<<8), -+ UPDATE_COEF(0x4a, 7<<6, 7<<6), -+ UPDATE_COEF(0x4a, 3<<4, 3<<4), -+ {} -+ }; - - switch (codec->core.vendor_id) { - case 0x10ec0255: -@@ -3912,6 +3942,9 @@ static void alc_headset_mode_ctia(struct hda_codec *codec) - case 0x10ec0668: - alc_process_coef_fw(codec, coef0688); - break; -+ case 0x10ec0225: -+ alc_process_coef_fw(codec, coef0225); -+ break; - } - codec_dbg(codec, "Headset jack set to iPhone-style headset mode.\n"); - } -@@ -3955,6 +3988,13 @@ static void alc_headset_mode_omtp(struct hda_codec *codec) - WRITE_COEF(0xc3, 0x0000), - {} - }; -+ static struct coef_fw coef0225[] = { -+ UPDATE_COEF(0x45, 0x3f<<10, 0x39<<10), -+ UPDATE_COEF(0x49, 1<<8, 1<<8), -+ UPDATE_COEF(0x4a, 7<<6, 7<<6), -+ UPDATE_COEF(0x4a, 3<<4, 3<<4), -+ {} -+ }; - - switch (codec->core.vendor_id) { - case 0x10ec0255: -@@ -3983,6 +4023,9 @@ static void alc_headset_mode_omtp(struct hda_codec *codec) - case 0x10ec0668: - alc_process_coef_fw(codec, coef0688); - break; -+ case 0x10ec0225: -+ alc_process_coef_fw(codec, coef0225); -+ break; - } - codec_dbg(codec, "Headset jack set to Nokia-style headset mode.\n"); - } -@@ -4014,6 +4057,11 @@ static void alc_determine_headset_type(struct hda_codec *codec) - WRITE_COEF(0xc3, 0x0c00), - {} - }; -+ static struct coef_fw coef0225[] = { -+ UPDATE_COEF(0x45, 0x3f<<10, 0x34<<10), -+ UPDATE_COEF(0x49, 1<<8, 1<<8), -+ {} -+ }; - - switch (codec->core.vendor_id) { - case 0x10ec0255: -@@ -4058,6 +4106,12 @@ static void alc_determine_headset_type(struct hda_codec *codec) - val = alc_read_coef_idx(codec, 0xbe); - is_ctia = (val & 0x1c02) == 0x1c02; - break; -+ case 0x10ec0225: -+ alc_process_coef_fw(codec, coef0225); -+ msleep(800); -+ val = alc_read_coef_idx(codec, 0x46); -+ is_ctia = (val & 0x00f0) == 0x00f0; -+ break; - } - - codec_dbg(codec, "Headset jack detected iPhone-style headset: %s\n", -@@ -5560,6 +5614,9 @@ static const struct hda_model_fixup alc269_fixup_models[] = { - {.id = ALC292_FIXUP_TPT440, .name = "tpt440"}, - {} - }; -+#define ALC225_STANDARD_PINS \ -+ {0x12, 0xb7a60130}, \ -+ {0x21, 0x04211020} - - #define ALC256_STANDARD_PINS \ - {0x12, 0x90a60140}, \ -@@ -5581,6 +5638,12 @@ static const struct hda_model_fixup alc269_fixup_models[] = { - {0x21, 0x03211020} - - static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = { -+ SND_HDA_PIN_QUIRK(0x10ec0225, 0x1028, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE, -+ ALC225_STANDARD_PINS, -+ {0x14, 0x901701a0}), -+ SND_HDA_PIN_QUIRK(0x10ec0225, 0x1028, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE, -+ ALC225_STANDARD_PINS, -+ {0x14, 0x901701b0}), - SND_HDA_PIN_QUIRK(0x10ec0255, 0x1028, "Dell", ALC255_FIXUP_DELL2_MIC_NO_PRESENCE, - {0x14, 0x90170110}, - {0x21, 0x02211020}), -@@ -5906,6 +5969,9 @@ static int patch_alc269(struct hda_codec *codec) - spec->gen.mixer_nid = 0; /* ALC256 does not have any loopback mixer path */ - alc_update_coef_idx(codec, 0x36, 1 << 13, 1 << 5); /* Switch pcbeep path to Line in path*/ - break; -+ case 0x10ec0225: -+ spec->codec_variant = ALC269_TYPE_ALC225; -+ break; - } - - if (snd_hda_codec_read(codec, 0x51, 0, AC_VERB_PARAMETERS, 0) == 0x10ec5505) { -@@ -6796,6 +6862,7 @@ static int patch_alc680(struct hda_codec *codec) - */ - static const struct hda_device_id snd_hda_id_realtek[] = { - HDA_CODEC_ENTRY(0x10ec0221, "ALC221", patch_alc269), -+ HDA_CODEC_ENTRY(0x10ec0225, "ALC225", patch_alc269), - HDA_CODEC_ENTRY(0x10ec0231, "ALC231", patch_alc269), - HDA_CODEC_ENTRY(0x10ec0233, "ALC233", patch_alc269), - HDA_CODEC_ENTRY(0x10ec0235, "ALC233", patch_alc269), -diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c -index 2c7c5eb..37b70f8 100644 ---- a/sound/pci/hda/patch_sigmatel.c -+++ b/sound/pci/hda/patch_sigmatel.c -@@ -493,9 +493,9 @@ static void jack_update_power(struct hda_codec *codec, - if (!spec->num_pwrs) - return; - -- if (jack && jack->tbl->nid) { -- stac_toggle_power_map(codec, jack->tbl->nid, -- snd_hda_jack_detect(codec, jack->tbl->nid), -+ if (jack && jack->nid) { -+ stac_toggle_power_map(codec, jack->nid, -+ snd_hda_jack_detect(codec, jack->nid), - true); - return; - } -diff --git a/sound/soc/codecs/rt5645.c b/sound/soc/codecs/rt5645.c -index 3e3c7f6..b74840b 100644 ---- a/sound/soc/codecs/rt5645.c -+++ b/sound/soc/codecs/rt5645.c -@@ -621,7 +621,7 @@ static const struct snd_kcontrol_new rt5645_snd_controls[] = { - - /* IN1/IN2 Control */ - SOC_SINGLE_TLV("IN1 Boost", RT5645_IN1_CTRL1, -- RT5645_BST_SFT1, 8, 0, bst_tlv), -+ RT5645_BST_SFT1, 12, 0, bst_tlv), - SOC_SINGLE_TLV("IN2 Boost", RT5645_IN2_CTRL, - RT5645_BST_SFT2, 8, 0, bst_tlv), - -diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c -index c86dc96..65b936e 100644 ---- a/sound/soc/soc-pcm.c -+++ b/sound/soc/soc-pcm.c -@@ -1743,7 +1743,8 @@ int dpcm_be_dai_hw_free(struct snd_soc_pcm_runtime *fe, int stream) - (be->dpcm[stream].state != SND_SOC_DPCM_STATE_PREPARE) && - (be->dpcm[stream].state != SND_SOC_DPCM_STATE_HW_FREE) && - (be->dpcm[stream].state != SND_SOC_DPCM_STATE_PAUSED) && -- (be->dpcm[stream].state != SND_SOC_DPCM_STATE_STOP)) -+ (be->dpcm[stream].state != SND_SOC_DPCM_STATE_STOP) && -+ (be->dpcm[stream].state != SND_SOC_DPCM_STATE_SUSPEND)) - continue; - - dev_dbg(be->dev, "ASoC: hw_free BE %s\n", -diff --git a/sound/sparc/Kconfig b/sound/sparc/Kconfig -index d75deba..dfcd386 100644 ---- a/sound/sparc/Kconfig -+++ b/sound/sparc/Kconfig -@@ -22,6 +22,7 @@ config SND_SUN_AMD7930 - config SND_SUN_CS4231 - tristate "Sun CS4231" - select SND_PCM -+ select SND_TIMER - help - Say Y here to include support for CS4231 sound device on Sun. - -diff --git a/sound/usb/midi.c b/sound/usb/midi.c -index 5b4c58c..b21b766 100644 ---- a/sound/usb/midi.c -+++ b/sound/usb/midi.c -@@ -2454,7 +2454,6 @@ int snd_usbmidi_create(struct snd_card *card, - else - err = snd_usbmidi_create_endpoints(umidi, endpoints); - if (err < 0) { -- snd_usbmidi_free(umidi); - return err; - } - -diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c -index 23ea6d8..4f6ce1c 100644 ---- a/sound/usb/quirks.c -+++ b/sound/usb/quirks.c -@@ -1121,6 +1121,7 @@ bool snd_usb_get_sample_rate_quirk(struct snd_usb_audio *chip) - switch (chip->usb_id) { - case USB_ID(0x045E, 0x075D): /* MS Lifecam Cinema */ - case USB_ID(0x045E, 0x076D): /* MS Lifecam HD-5000 */ -+ case USB_ID(0x045E, 0x076F): /* MS Lifecam HD-6000 */ - case USB_ID(0x045E, 0x0772): /* MS Lifecam Studio */ - case USB_ID(0x045E, 0x0779): /* MS Lifecam HD-3000 */ - case USB_ID(0x04D8, 0xFEEA): /* Benchmark DAC1 Pre */ -@@ -1205,8 +1206,12 @@ void snd_usb_set_interface_quirk(struct usb_device *dev) - * "Playback Design" products need a 50ms delay after setting the - * USB interface. - */ -- if (le16_to_cpu(dev->descriptor.idVendor) == 0x23ba) -+ switch (le16_to_cpu(dev->descriptor.idVendor)) { -+ case 0x23ba: /* Playback Design */ -+ case 0x0644: /* TEAC Corp. */ - mdelay(50); -+ break; -+ } - } - - void snd_usb_ctl_msg_quirk(struct usb_device *dev, unsigned int pipe, -@@ -1221,6 +1226,14 @@ void snd_usb_ctl_msg_quirk(struct usb_device *dev, unsigned int pipe, - (requesttype & USB_TYPE_MASK) == USB_TYPE_CLASS) - mdelay(20); - -+ /* -+ * "TEAC Corp." products need a 20ms delay after each -+ * class compliant request -+ */ -+ if ((le16_to_cpu(dev->descriptor.idVendor) == 0x0644) && -+ (requesttype & USB_TYPE_MASK) == USB_TYPE_CLASS) -+ mdelay(20); -+ - /* Marantz/Denon devices with USB DAC functionality need a delay - * after each class compliant request - */ -@@ -1269,7 +1282,7 @@ u64 snd_usb_interface_dsd_format_quirks(struct snd_usb_audio *chip, - case USB_ID(0x20b1, 0x3008): /* iFi Audio micro/nano iDSD */ - case USB_ID(0x20b1, 0x2008): /* Matrix Audio X-Sabre */ - case USB_ID(0x20b1, 0x300a): /* Matrix Audio Mini-i Pro */ -- case USB_ID(0x22d8, 0x0416): /* OPPO HA-1*/ -+ case USB_ID(0x22d9, 0x0416): /* OPPO HA-1 */ - if (fp->altsetting == 2) - return SNDRV_PCM_FMTBIT_DSD_U32_BE; - break; -@@ -1278,6 +1291,7 @@ u64 snd_usb_interface_dsd_format_quirks(struct snd_usb_audio *chip, - case USB_ID(0x20b1, 0x2009): /* DIYINHK DSD DXD 384kHz USB to I2S/DSD */ - case USB_ID(0x20b1, 0x2023): /* JLsounds I2SoverUSB */ - case USB_ID(0x20b1, 0x3023): /* Aune X1S 32BIT/384 DSD DAC */ -+ case USB_ID(0x2616, 0x0106): /* PS Audio NuWave DAC */ - if (fp->altsetting == 3) - return SNDRV_PCM_FMTBIT_DSD_U32_BE; - break; |