patches for 4.4

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-4.4/crypto-crypto4xx-properly-set-iv-after-de-and-encryp.patch b/queue-4.4/crypto-crypto4xx-properly-set-iv-after-de-and-encryp.patch
new file mode 100644 (file)
index 0000000..418aeee
--- /dev/null
+++ b/queue-4.4/crypto-crypto4xx-properly-set-iv-after-de-and-encryp.patch
@@ -0,0 +1,81 @@
+From 57d7b405560b92ef23207097442299fff1c159f3 Mon Sep 17 00:00:00 2001
+From: Christian Lamparter <chunkeey@gmail.com>
+Date: Thu, 19 Apr 2018 18:41:55 +0200
+Subject: crypto: crypto4xx - properly set IV after de- and encrypt
+
+[ Upstream commit fc340115ffb8235c1bbd200c28855e6373d0dd1a ]
+
+This patch fixes cts(cbc(aes)) test when cbc-aes-ppc4xx is used.
+alg: skcipher: Test 1 failed (invalid result) on encryption for cts(cbc-aes-ppc4xx)
+00000000: 4b 10 75 fc 2f 14 1b 6a 27 35 37 33 d1 b7 70 05
+00000010: 97
+alg: skcipher: Failed to load transform for cts(cbc(aes)): -2
+
+The CTS cipher mode expect the IV (req->iv) of skcipher_request
+to contain the last ciphertext block after the {en,de}crypt
+operation is complete.
+
+Fix this issue for the AMCC Crypto4xx hardware engine.
+The tcrypt test case for cts(cbc(aes)) is now correctly passed.
+
+name         : cts(cbc(aes))
+driver       : cts(cbc-aes-ppc4xx)
+module       : cts
+priority     : 300
+refcnt       : 1
+selftest     : passed
+internal     : no
+type         : skcipher
+async        : yes
+blocksize    : 16
+min keysize  : 16
+max keysize  : 32
+ivsize       : 16
+chunksize    : 16
+walksize     : 16
+
+Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
+Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ drivers/crypto/amcc/crypto4xx_alg.c  | 3 ++-
+ drivers/crypto/amcc/crypto4xx_core.c | 9 +++++++++
+ 2 files changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/crypto/amcc/crypto4xx_alg.c b/drivers/crypto/amcc/crypto4xx_alg.c
+index 4afca3968773..e3b8bebfdd30 100644
+--- a/drivers/crypto/amcc/crypto4xx_alg.c
++++ b/drivers/crypto/amcc/crypto4xx_alg.c
+@@ -138,7 +138,8 @@ static int crypto4xx_setkey_aes(struct crypto_ablkcipher *cipher,
+       sa = (struct dynamic_sa_ctl *) ctx->sa_in;
+       ctx->hash_final = 0;
+ 
+-      set_dynamic_sa_command_0(sa, SA_NOT_SAVE_HASH, SA_NOT_SAVE_IV,
++      set_dynamic_sa_command_0(sa, SA_NOT_SAVE_HASH, (cm == CRYPTO_MODE_CBC ?
++                               SA_SAVE_IV : SA_NOT_SAVE_IV),
+                                SA_LOAD_HASH_FROM_SA, SA_LOAD_IV_FROM_STATE,
+                                SA_NO_HEADER_PROC, SA_HASH_ALG_NULL,
+                                SA_CIPHER_ALG_AES, SA_PAD_TYPE_ZERO,
+diff --git a/drivers/crypto/amcc/crypto4xx_core.c b/drivers/crypto/amcc/crypto4xx_core.c
+index 78d0722feacb..1e810f5f03fa 100644
+--- a/drivers/crypto/amcc/crypto4xx_core.c
++++ b/drivers/crypto/amcc/crypto4xx_core.c
+@@ -645,6 +645,15 @@ static u32 crypto4xx_ablkcipher_done(struct crypto4xx_device *dev,
+               addr = dma_map_page(dev->core_dev->device, sg_page(dst),
+                                   dst->offset, dst->length, DMA_FROM_DEVICE);
+       }
++
++      if (pd_uinfo->sa_va->sa_command_0.bf.save_iv == SA_SAVE_IV) {
++              struct crypto_skcipher *skcipher = crypto_skcipher_reqtfm(req);
++
++              crypto4xx_memcpy_from_le32((u32 *)req->iv,
++                      pd_uinfo->sr_va->save_iv,
++                      crypto_skcipher_ivsize(skcipher));
++      }
++
+       crypto4xx_ret_sg_desc(dev, pd_uinfo);
+       if (ablk_req->base.complete != NULL)
+               ablk_req->base.complete(&ablk_req->base, 0);
+-- 
+2.19.1
+

diff --git a/queue-4.4/modpost-file2alias-check-prototype-of-handler.patch b/queue-4.4/modpost-file2alias-check-prototype-of-handler.patch
new file mode 100644 (file)
index 0000000..6e53c98
--- /dev/null
+++ b/queue-4.4/modpost-file2alias-check-prototype-of-handler.patch
@@ -0,0 +1,57 @@
+From 197d14ac4a99e136d711d58793f65127c86dab58 Mon Sep 17 00:00:00 2001
+From: Masahiro Yamada <yamada.masahiro@socionext.com>
+Date: Thu, 22 Nov 2018 13:28:42 +0900
+Subject: modpost: file2alias: check prototype of handler
+
+commit f880eea68fe593342fa6e09be9bb661f3c297aec upstream.
+
+Use specific prototype instead of an opaque pointer so that the
+compiler can catch function prototype mismatch.
+
+Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
+Reviewed-by: Mathieu Malaterre <malat@debian.org>
+Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ scripts/mod/file2alias.c | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
+index d0b164084225..4250d3d6f391 100644
+--- a/scripts/mod/file2alias.c
++++ b/scripts/mod/file2alias.c
+@@ -47,7 +47,7 @@ typedef struct {
+ struct devtable {
+       const char *device_id; /* name of table, __mod_<name>__*_device_table. */
+       unsigned long id_size;
+-      void *function;
++      int (*do_entry)(const char *filename, void *symval, char *alias);
+ };
+ 
+ /* Define a variable f that holds the value of field f of struct devid
+@@ -1198,12 +1198,11 @@ static bool sym_is(const char *name, unsigned namelen, const char *symbol)
+ static void do_table(void *symval, unsigned long size,
+                    unsigned long id_size,
+                    const char *device_id,
+-                   void *function,
++                   int (*do_entry)(const char *filename, void *symval, char *alias),
+                    struct module *mod)
+ {
+       unsigned int i;
+       char alias[500];
+-      int (*do_entry)(const char *, void *entry, char *alias) = function;
+ 
+       device_id_check(mod->name, device_id, size, id_size, symval);
+       /* Leave last one: it's the terminator. */
+@@ -1314,7 +1313,7 @@ void handle_moddevtable(struct module *mod, struct elf_info *info,
+ 
+                       if (sym_is(name, namelen, p->device_id)) {
+                               do_table(symval, sym->st_size, p->id_size,
+-                                       p->device_id, p->function, mod);
++                                       p->device_id, p->do_entry, mod);
+                               break;
+                       }
+               }
+-- 
+2.19.1
+

diff --git a/queue-4.4/modpost-file2alias-go-back-to-simple-devtable-lookup.patch b/queue-4.4/modpost-file2alias-go-back-to-simple-devtable-lookup.patch
new file mode 100644 (file)
index 0000000..04647d0
--- /dev/null
+++ b/queue-4.4/modpost-file2alias-go-back-to-simple-devtable-lookup.patch
@@ -0,0 +1,444 @@
+From 1546cb7c7b363209fc9e09a8f917efaf02ea5627 Mon Sep 17 00:00:00 2001
+From: Masahiro Yamada <yamada.masahiro@socionext.com>
+Date: Thu, 22 Nov 2018 13:28:41 +0900
+Subject: modpost: file2alias: go back to simple devtable lookup
+
+commit ec91e78d378cc5d4b43805a1227d8e04e5dfa17d upstream.
+
+Commit e49ce14150c6 ("modpost: use linker section to generate table.")
+was not so cool as we had expected first; it ended up with ugly section
+hacks when commit dd2a3acaecd7 ("mod/file2alias: make modpost compile
+on darwin again") came in.
+
+Given a certain degree of unknowledge about the link stage of host
+programs, I really want to see simple, stupid table lookup so that
+this works in the same way regardless of the underlying executable
+format.
+
+Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
+Acked-by: Mathieu Malaterre <malat@debian.org>
+[nc: Omit rpmsg, sdw, fslmc, tbsvc, and typec as they don't exist here
+     Add of to avoid backporting two larger patches]
+Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ scripts/mod/file2alias.c | 136 +++++++++++++--------------------------
+ 1 file changed, 45 insertions(+), 91 deletions(-)
+
+diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
+index 9f5cdd49ff0b..d0b164084225 100644
+--- a/scripts/mod/file2alias.c
++++ b/scripts/mod/file2alias.c
+@@ -50,46 +50,6 @@ struct devtable {
+       void *function;
+ };
+ 
+-#define ___cat(a,b) a ## b
+-#define __cat(a,b) ___cat(a,b)
+-
+-/* we need some special handling for this host tool running eventually on
+- * Darwin. The Mach-O section handling is a bit different than ELF section
+- * handling. The differnces in detail are:
+- *  a) we have segments which have sections
+- *  b) we need a API call to get the respective section symbols */
+-#if defined(__MACH__)
+-#include <mach-o/getsect.h>
+-
+-#define INIT_SECTION(name)  do {                                      \
+-              unsigned long name ## _len;                             \
+-              char *__cat(pstart_,name) = getsectdata("__TEXT",       \
+-                      #name, &__cat(name,_len));                      \
+-              char *__cat(pstop_,name) = __cat(pstart_,name) +        \
+-                      __cat(name, _len);                              \
+-              __cat(__start_,name) = (void *)__cat(pstart_,name);     \
+-              __cat(__stop_,name) = (void *)__cat(pstop_,name);       \
+-      } while (0)
+-#define SECTION(name)   __attribute__((section("__TEXT, " #name)))
+-
+-struct devtable **__start___devtable, **__stop___devtable;
+-#else
+-#define INIT_SECTION(name) /* no-op for ELF */
+-#define SECTION(name)   __attribute__((section(#name)))
+-
+-/* We construct a table of pointers in an ELF section (pointers generally
+- * go unpadded by gcc).  ld creates boundary syms for us. */
+-extern struct devtable *__start___devtable[], *__stop___devtable[];
+-#endif /* __MACH__ */
+-
+-#if !defined(__used)
+-# if __GNUC__ == 3 && __GNUC_MINOR__ < 3
+-#  define __used                      __attribute__((__unused__))
+-# else
+-#  define __used                      __attribute__((__used__))
+-# endif
+-#endif
+-
+ /* Define a variable f that holds the value of field f of struct devid
+  * based at address m.
+  */
+@@ -102,16 +62,6 @@ extern struct devtable *__start___devtable[], *__stop___devtable[];
+ #define DEF_FIELD_ADDR(m, devid, f) \
+       typeof(((struct devid *)0)->f) *f = ((m) + OFF_##devid##_##f)
+ 
+-/* Add a table entry.  We test function type matches while we're here. */
+-#define ADD_TO_DEVTABLE(device_id, type, function) \
+-      static struct devtable __cat(devtable,__LINE__) = {     \
+-              device_id + 0*sizeof((function)((const char *)NULL,     \
+-                                              (void *)NULL,           \
+-                                              (char *)NULL)),         \
+-              SIZE_##type, (function) };                              \
+-      static struct devtable *SECTION(__devtable) __used \
+-              __cat(devtable_ptr,__LINE__) = &__cat(devtable,__LINE__)
+-
+ #define ADD(str, sep, cond, field)                              \
+ do {                                                            \
+         strcat(str, sep);                                       \
+@@ -388,7 +338,6 @@ static int do_hid_entry(const char *filename,
+ 
+       return 1;
+ }
+-ADD_TO_DEVTABLE("hid", hid_device_id, do_hid_entry);
+ 
+ /* Looks like: ieee1394:venNmoNspNverN */
+ static int do_ieee1394_entry(const char *filename,
+@@ -413,7 +362,6 @@ static int do_ieee1394_entry(const char *filename,
+       add_wildcard(alias);
+       return 1;
+ }
+-ADD_TO_DEVTABLE("ieee1394", ieee1394_device_id, do_ieee1394_entry);
+ 
+ /* Looks like: pci:vNdNsvNsdNbcNscNiN. */
+ static int do_pci_entry(const char *filename,
+@@ -457,7 +405,6 @@ static int do_pci_entry(const char *filename,
+       add_wildcard(alias);
+       return 1;
+ }
+-ADD_TO_DEVTABLE("pci", pci_device_id, do_pci_entry);
+ 
+ /* looks like: "ccw:tNmNdtNdmN" */
+ static int do_ccw_entry(const char *filename,
+@@ -481,7 +428,6 @@ static int do_ccw_entry(const char *filename,
+       add_wildcard(alias);
+       return 1;
+ }
+-ADD_TO_DEVTABLE("ccw", ccw_device_id, do_ccw_entry);
+ 
+ /* looks like: "ap:tN" */
+ static int do_ap_entry(const char *filename,
+@@ -492,7 +438,6 @@ static int do_ap_entry(const char *filename,
+       sprintf(alias, "ap:t%02X*", dev_type);
+       return 1;
+ }
+-ADD_TO_DEVTABLE("ap", ap_device_id, do_ap_entry);
+ 
+ /* looks like: "css:tN" */
+ static int do_css_entry(const char *filename,
+@@ -503,7 +448,6 @@ static int do_css_entry(const char *filename,
+       sprintf(alias, "css:t%01X", type);
+       return 1;
+ }
+-ADD_TO_DEVTABLE("css", css_device_id, do_css_entry);
+ 
+ /* Looks like: "serio:tyNprNidNexN" */
+ static int do_serio_entry(const char *filename,
+@@ -523,7 +467,6 @@ static int do_serio_entry(const char *filename,
+       add_wildcard(alias);
+       return 1;
+ }
+-ADD_TO_DEVTABLE("serio", serio_device_id, do_serio_entry);
+ 
+ /* looks like: "acpi:ACPI0003" or "acpi:PNP0C0B" or "acpi:LNXVIDEO" or
+  *             "acpi:bbsspp" (bb=base-class, ss=sub-class, pp=prog-if)
+@@ -561,7 +504,6 @@ static int do_acpi_entry(const char *filename,
+       }
+       return 1;
+ }
+-ADD_TO_DEVTABLE("acpi", acpi_device_id, do_acpi_entry);
+ 
+ /* looks like: "pnp:dD" */
+ static void do_pnp_device_entry(void *symval, unsigned long size,
+@@ -682,7 +624,6 @@ static int do_pcmcia_entry(const char *filename,
+       add_wildcard(alias);
+       return 1;
+ }
+-ADD_TO_DEVTABLE("pcmcia", pcmcia_device_id, do_pcmcia_entry);
+ 
+ static int do_of_entry (const char *filename, void *symval, char *alias)
+ {
+@@ -707,7 +648,6 @@ static int do_of_entry (const char *filename, void *symval, char *alias)
+       add_wildcard(alias);
+       return 1;
+ }
+-ADD_TO_DEVTABLE("of", of_device_id, do_of_entry);
+ 
+ static int do_vio_entry(const char *filename, void *symval,
+               char *alias)
+@@ -727,7 +667,6 @@ static int do_vio_entry(const char *filename, void *symval,
+       add_wildcard(alias);
+       return 1;
+ }
+-ADD_TO_DEVTABLE("vio", vio_device_id, do_vio_entry);
+ 
+ #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
+ 
+@@ -800,7 +739,6 @@ static int do_input_entry(const char *filename, void *symval,
+               do_input(alias, *swbit, 0, INPUT_DEVICE_ID_SW_MAX);
+       return 1;
+ }
+-ADD_TO_DEVTABLE("input", input_device_id, do_input_entry);
+ 
+ static int do_eisa_entry(const char *filename, void *symval,
+               char *alias)
+@@ -812,7 +750,6 @@ static int do_eisa_entry(const char *filename, void *symval,
+               strcat(alias, "*");
+       return 1;
+ }
+-ADD_TO_DEVTABLE("eisa", eisa_device_id, do_eisa_entry);
+ 
+ /* Looks like: parisc:tNhvNrevNsvN */
+ static int do_parisc_entry(const char *filename, void *symval,
+@@ -832,7 +769,6 @@ static int do_parisc_entry(const char *filename, void *symval,
+       add_wildcard(alias);
+       return 1;
+ }
+-ADD_TO_DEVTABLE("parisc", parisc_device_id, do_parisc_entry);
+ 
+ /* Looks like: sdio:cNvNdN. */
+ static int do_sdio_entry(const char *filename,
+@@ -849,7 +785,6 @@ static int do_sdio_entry(const char *filename,
+       add_wildcard(alias);
+       return 1;
+ }
+-ADD_TO_DEVTABLE("sdio", sdio_device_id, do_sdio_entry);
+ 
+ /* Looks like: ssb:vNidNrevN. */
+ static int do_ssb_entry(const char *filename,
+@@ -866,7 +801,6 @@ static int do_ssb_entry(const char *filename,
+       add_wildcard(alias);
+       return 1;
+ }
+-ADD_TO_DEVTABLE("ssb", ssb_device_id, do_ssb_entry);
+ 
+ /* Looks like: bcma:mNidNrevNclN. */
+ static int do_bcma_entry(const char *filename,
+@@ -885,7 +819,6 @@ static int do_bcma_entry(const char *filename,
+       add_wildcard(alias);
+       return 1;
+ }
+-ADD_TO_DEVTABLE("bcma", bcma_device_id, do_bcma_entry);
+ 
+ /* Looks like: virtio:dNvN */
+ static int do_virtio_entry(const char *filename, void *symval,
+@@ -901,7 +834,6 @@ static int do_virtio_entry(const char *filename, void *symval,
+       add_wildcard(alias);
+       return 1;
+ }
+-ADD_TO_DEVTABLE("virtio", virtio_device_id, do_virtio_entry);
+ 
+ /*
+  * Looks like: vmbus:guid
+@@ -924,7 +856,6 @@ static int do_vmbus_entry(const char *filename, void *symval,
+ 
+       return 1;
+ }
+-ADD_TO_DEVTABLE("vmbus", hv_vmbus_device_id, do_vmbus_entry);
+ 
+ /* Looks like: i2c:S */
+ static int do_i2c_entry(const char *filename, void *symval,
+@@ -935,7 +866,6 @@ static int do_i2c_entry(const char *filename, void *symval,
+ 
+       return 1;
+ }
+-ADD_TO_DEVTABLE("i2c", i2c_device_id, do_i2c_entry);
+ 
+ /* Looks like: spi:S */
+ static int do_spi_entry(const char *filename, void *symval,
+@@ -946,7 +876,6 @@ static int do_spi_entry(const char *filename, void *symval,
+ 
+       return 1;
+ }
+-ADD_TO_DEVTABLE("spi", spi_device_id, do_spi_entry);
+ 
+ static const struct dmifield {
+       const char *prefix;
+@@ -1001,7 +930,6 @@ static int do_dmi_entry(const char *filename, void *symval,
+       strcat(alias, ":");
+       return 1;
+ }
+-ADD_TO_DEVTABLE("dmi", dmi_system_id, do_dmi_entry);
+ 
+ static int do_platform_entry(const char *filename,
+                            void *symval, char *alias)
+@@ -1010,7 +938,6 @@ static int do_platform_entry(const char *filename,
+       sprintf(alias, PLATFORM_MODULE_PREFIX "%s", *name);
+       return 1;
+ }
+-ADD_TO_DEVTABLE("platform", platform_device_id, do_platform_entry);
+ 
+ static int do_mdio_entry(const char *filename,
+                        void *symval, char *alias)
+@@ -1035,7 +962,6 @@ static int do_mdio_entry(const char *filename,
+ 
+       return 1;
+ }
+-ADD_TO_DEVTABLE("mdio", mdio_device_id, do_mdio_entry);
+ 
+ /* Looks like: zorro:iN. */
+ static int do_zorro_entry(const char *filename, void *symval,
+@@ -1046,7 +972,6 @@ static int do_zorro_entry(const char *filename, void *symval,
+       ADD(alias, "i", id != ZORRO_WILDCARD, id);
+       return 1;
+ }
+-ADD_TO_DEVTABLE("zorro", zorro_device_id, do_zorro_entry);
+ 
+ /* looks like: "pnp:dD" */
+ static int do_isapnp_entry(const char *filename,
+@@ -1062,7 +987,6 @@ static int do_isapnp_entry(const char *filename,
+               (function >> 12) & 0x0f, (function >> 8) & 0x0f);
+       return 1;
+ }
+-ADD_TO_DEVTABLE("isapnp", isapnp_device_id, do_isapnp_entry);
+ 
+ /* Looks like: "ipack:fNvNdN". */
+ static int do_ipack_entry(const char *filename,
+@@ -1078,7 +1002,6 @@ static int do_ipack_entry(const char *filename,
+       add_wildcard(alias);
+       return 1;
+ }
+-ADD_TO_DEVTABLE("ipack", ipack_device_id, do_ipack_entry);
+ 
+ /*
+  * Append a match expression for a single masked hex digit.
+@@ -1149,7 +1072,6 @@ static int do_amba_entry(const char *filename,
+ 
+       return 1;
+ }
+-ADD_TO_DEVTABLE("amba", amba_id, do_amba_entry);
+ 
+ /*
+  * looks like: "mipscdmm:tN"
+@@ -1165,7 +1087,6 @@ static int do_mips_cdmm_entry(const char *filename,
+       sprintf(alias, "mipscdmm:t%02X*", type);
+       return 1;
+ }
+-ADD_TO_DEVTABLE("mipscdmm", mips_cdmm_device_id, do_mips_cdmm_entry);
+ 
+ /* LOOKS like cpu:type:x86,venVVVVfamFFFFmodMMMM:feature:*,FEAT,*
+  * All fields are numbers. It would be nicer to use strings for vendor
+@@ -1190,7 +1111,6 @@ static int do_x86cpu_entry(const char *filename, void *symval,
+               sprintf(alias + strlen(alias), "%04X*", feature);
+       return 1;
+ }
+-ADD_TO_DEVTABLE("x86cpu", x86_cpu_id, do_x86cpu_entry);
+ 
+ /* LOOKS like cpu:type:*:feature:*FEAT* */
+ static int do_cpu_entry(const char *filename, void *symval, char *alias)
+@@ -1200,7 +1120,6 @@ static int do_cpu_entry(const char *filename, void *symval, char *alias)
+       sprintf(alias, "cpu:type:*:feature:*%04X*", feature);
+       return 1;
+ }
+-ADD_TO_DEVTABLE("cpu", cpu_feature, do_cpu_entry);
+ 
+ /* Looks like: mei:S:uuid:N:* */
+ static int do_mei_entry(const char *filename, void *symval,
+@@ -1219,7 +1138,6 @@ static int do_mei_entry(const char *filename, void *symval,
+ 
+       return 1;
+ }
+-ADD_TO_DEVTABLE("mei", mei_cl_device_id, do_mei_entry);
+ 
+ /* Looks like: rapidio:vNdNavNadN */
+ static int do_rio_entry(const char *filename,
+@@ -1239,7 +1157,6 @@ static int do_rio_entry(const char *filename,
+       add_wildcard(alias);
+       return 1;
+ }
+-ADD_TO_DEVTABLE("rapidio", rio_device_id, do_rio_entry);
+ 
+ /* Looks like: ulpi:vNpN */
+ static int do_ulpi_entry(const char *filename, void *symval,
+@@ -1252,7 +1169,6 @@ static int do_ulpi_entry(const char *filename, void *symval,
+ 
+       return 1;
+ }
+-ADD_TO_DEVTABLE("ulpi", ulpi_device_id, do_ulpi_entry);
+ 
+ /* Looks like: hdaudio:vNrNaN */
+ static int do_hda_entry(const char *filename, void *symval, char *alias)
+@@ -1269,7 +1185,6 @@ static int do_hda_entry(const char *filename, void *symval, char *alias)
+       add_wildcard(alias);
+       return 1;
+ }
+-ADD_TO_DEVTABLE("hdaudio", hda_device_id, do_hda_entry);
+ 
+ /* Does namelen bytes of name exactly match the symbol? */
+ static bool sym_is(const char *name, unsigned namelen, const char *symbol)
+@@ -1302,6 +1217,44 @@ static void do_table(void *symval, unsigned long size,
+       }
+ }
+ 
++static const struct devtable devtable[] = {
++      {"hid", SIZE_hid_device_id, do_hid_entry},
++      {"ieee1394", SIZE_ieee1394_device_id, do_ieee1394_entry},
++      {"pci", SIZE_pci_device_id, do_pci_entry},
++      {"ccw", SIZE_ccw_device_id, do_ccw_entry},
++      {"ap", SIZE_ap_device_id, do_ap_entry},
++      {"css", SIZE_css_device_id, do_css_entry},
++      {"serio", SIZE_serio_device_id, do_serio_entry},
++      {"acpi", SIZE_acpi_device_id, do_acpi_entry},
++      {"pcmcia", SIZE_pcmcia_device_id, do_pcmcia_entry},
++      {"vio", SIZE_vio_device_id, do_vio_entry},
++      {"input", SIZE_input_device_id, do_input_entry},
++      {"eisa", SIZE_eisa_device_id, do_eisa_entry},
++      {"parisc", SIZE_parisc_device_id, do_parisc_entry},
++      {"sdio", SIZE_sdio_device_id, do_sdio_entry},
++      {"ssb", SIZE_ssb_device_id, do_ssb_entry},
++      {"bcma", SIZE_bcma_device_id, do_bcma_entry},
++      {"virtio", SIZE_virtio_device_id, do_virtio_entry},
++      {"vmbus", SIZE_hv_vmbus_device_id, do_vmbus_entry},
++      {"i2c", SIZE_i2c_device_id, do_i2c_entry},
++      {"spi", SIZE_spi_device_id, do_spi_entry},
++      {"dmi", SIZE_dmi_system_id, do_dmi_entry},
++      {"platform", SIZE_platform_device_id, do_platform_entry},
++      {"mdio", SIZE_mdio_device_id, do_mdio_entry},
++      {"zorro", SIZE_zorro_device_id, do_zorro_entry},
++      {"isapnp", SIZE_isapnp_device_id, do_isapnp_entry},
++      {"ipack", SIZE_ipack_device_id, do_ipack_entry},
++      {"amba", SIZE_amba_id, do_amba_entry},
++      {"mipscdmm", SIZE_mips_cdmm_device_id, do_mips_cdmm_entry},
++      {"x86cpu", SIZE_x86_cpu_id, do_x86cpu_entry},
++      {"cpu", SIZE_cpu_feature, do_cpu_entry},
++      {"mei", SIZE_mei_cl_device_id, do_mei_entry},
++      {"rapidio", SIZE_rio_device_id, do_rio_entry},
++      {"ulpi", SIZE_ulpi_device_id, do_ulpi_entry},
++      {"hdaudio", SIZE_hda_device_id, do_hda_entry},
++      {"of", SIZE_of_device_id, do_of_entry},
++};
++
+ /* Create MODULE_ALIAS() statements.
+  * At this time, we cannot write the actual output C source yet,
+  * so we write into the mod->dev_table_buf buffer. */
+@@ -1354,13 +1307,14 @@ void handle_moddevtable(struct module *mod, struct elf_info *info,
+       else if (sym_is(name, namelen, "pnp_card"))
+               do_pnp_card_entries(symval, sym->st_size, mod);
+       else {
+-              struct devtable **p;
+-              INIT_SECTION(__devtable);
++              int i;
++
++              for (i = 0; i < ARRAY_SIZE(devtable); i++) {
++                      const struct devtable *p = &devtable[i];
+ 
+-              for (p = __start___devtable; p < __stop___devtable; p++) {
+-                      if (sym_is(name, namelen, (*p)->device_id)) {
+-                              do_table(symval, sym->st_size, (*p)->id_size,
+-                                       (*p)->device_id, (*p)->function, mod);
++                      if (sym_is(name, namelen, p->device_id)) {
++                              do_table(symval, sym->st_size, p->id_size,
++                                       p->device_id, p->function, mod);
+                               break;
+                       }
+               }
+-- 
+2.19.1
+

diff --git a/queue-4.4/series b/queue-4.4/series
index ba2b1863ed7629ef0b31609be969d346599fc32c..a138925b2c2486b691bdd2ec90fe11fd09390c40 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -134,3 +134,7 @@ include-linux-swap.h-use-offsetof-instead-of-custom-.patch
 tpm-tpm_crb-avoid-unaligned-reads-in-crb_recv.patch
 ovl-fix-uid-gid-when-creating-over-whiteout.patch
 appletalk-fix-compile-regression.patch
+crypto-crypto4xx-properly-set-iv-after-de-and-encryp.patch
+modpost-file2alias-go-back-to-simple-devtable-lookup.patch
+modpost-file2alias-check-prototype-of-handler.patch
+tpm-tpm_i2c_atmel-return-e2big-when-the-transfer-is-.patch

diff --git a/queue-4.4/tpm-tpm_i2c_atmel-return-e2big-when-the-transfer-is-.patch b/queue-4.4/tpm-tpm_i2c_atmel-return-e2big-when-the-transfer-is-.patch
new file mode 100644 (file)
index 0000000..c55633c
--- /dev/null
+++ b/queue-4.4/tpm-tpm_i2c_atmel-return-e2big-when-the-transfer-is-.patch
@@ -0,0 +1,44 @@
+From f299d6545ea9d1677ff601801990dd646414b26a Mon Sep 17 00:00:00 2001
+From: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
+Date: Tue, 23 Apr 2019 15:44:48 +0300
+Subject: tpm/tpm_i2c_atmel: Return -E2BIG when the transfer is incomplete
+
+commit 442601e87a4769a8daba4976ec3afa5222ca211d upstream
+
+Return -E2BIG when the transfer is incomplete. The upper layer does
+not retry, so not doing that is incorrect behaviour.
+
+Cc: stable@vger.kernel.org
+Fixes: a2871c62e186 ("tpm: Add support for Atmel I2C TPMs")
+Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
+Reviewed-by: Stefan Berger <stefanb@linux.ibm.com>
+Reviewed-by: Jerry Snitselaar <jsnitsel@redhat.com>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ drivers/char/tpm/tpm_i2c_atmel.c | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/char/tpm/tpm_i2c_atmel.c b/drivers/char/tpm/tpm_i2c_atmel.c
+index dd8f0eb3170a..73f7e0f7e34a 100644
+--- a/drivers/char/tpm/tpm_i2c_atmel.c
++++ b/drivers/char/tpm/tpm_i2c_atmel.c
+@@ -65,7 +65,15 @@ static int i2c_atmel_send(struct tpm_chip *chip, u8 *buf, size_t len)
+       dev_dbg(&chip->dev,
+               "%s(buf=%*ph len=%0zx) -> sts=%d\n", __func__,
+               (int)min_t(size_t, 64, len), buf, len, status);
+-      return status;
++
++      if (status < 0)
++              return status;
++
++      /* The upper layer does not support incomplete sends. */
++      if (status != len)
++              return -E2BIG;
++
++      return 0;
+ }
+ 
+ static int i2c_atmel_recv(struct tpm_chip *chip, u8 *buf, size_t count)
+-- 
+2.19.1
+