Merge remote-tracking branch 'crypto/master'

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/boot/dts/stih407-family.dtsi
index c944d3a5906d9eb0a3de96327766e3c2829ea9ec,0c24fcb0357703df59ca41588a9061f1da4f4bd0..81f81214cdf9580a0cb19ce01d8bfc5e01417252
--- 1/arch/arm/boot/dts/stih407-family.dtsi
--- 2/arch/arm/boot/dts/stih407-family.dtsi
+++ b/arch/arm/boot/dts/stih407-family.dtsi
@@@ -636,49 -609,20 +636,63 @@@
                        clock-names     = "pwm";
                        clocks          = <&clk_sysin>;
                        st,pwm-num-chan = <4>;
 +
 +                      status          = "disabled";
 +              };
 +
 +              rng10: rng@08a89000 {
 +                      compatible      = "st,rng";
 +                      reg             = <0x08a89000 0x1000>;
 +                      clocks          = <&clk_sysin>;
 +                      status          = "okay";
 +              };
 +
 +              rng11: rng@08a8a000 {
 +                      compatible      = "st,rng";
 +                      reg             = <0x08a8a000 0x1000>;
 +                      clocks          = <&clk_sysin>;
 +                      status          = "okay";
 +              };
 +
 +              ethernet0: dwmac@9630000 {
 +                      device_type = "network";
 +                      status = "disabled";
 +                      compatible = "st,stih407-dwmac", "snps,dwmac", "snps,dwmac-3.710";
 +                      reg = <0x9630000 0x8000>, <0x80 0x4>;
 +                      reg-names = "stmmaceth", "sti-ethconf";
 +
 +                      st,syscon = <&syscfg_sbc_reg 0x80>;
 +                      st,gmac_en;
 +                      resets = <&softreset STIH407_ETH1_SOFTRESET>;
 +                      reset-names = "stmmaceth";
 +
 +                      interrupts = <GIC_SPI 98 IRQ_TYPE_NONE>,
 +                                   <GIC_SPI 99 IRQ_TYPE_NONE>;
 +                      interrupt-names = "macirq", "eth_wake_irq";
 +
 +                      /* DMA Bus Mode */
 +                      snps,pbl = <8>;
 +
 +                      pinctrl-names = "default";
 +                      pinctrl-0 = <&pinctrl_rgmii1>;
 +
 +                      clock-names = "stmmaceth", "sti-ethclk";
 +                      clocks = <&clk_s_c0_flexgen CLK_EXT2F_A9>,
 +                               <&clk_s_c0_flexgen CLK_ETH_PHY>;
                };
+ 
+               rng10: rng@08a89000 {
+                       compatible      = "st,rng";
+                       reg             = <0x08a89000 0x1000>;
+                       clocks          = <&clk_sysin>;
+                       status          = "okay";
+               };
+ 
+               rng11: rng@08a8a000 {
+                       compatible      = "st,rng";
+                       reg             = <0x08a8a000 0x1000>;
+                       clocks          = <&clk_sysin>;
+                       status          = "okay";
+               };
        };
  };

diff --cc crypto/asymmetric_keys/x509_public_key.c
Simple merge

diff --cc drivers/crypto/marvell/cesa.h
index bc2a55bc35e4727290319b462008c695b7e2923e,186868e54ebc1438cb16995e45e1081c9ab63a6e..bd985e72520b56428af796e1531cfb8771099a9c
--- 1/drivers/crypto/marvell/cesa.h
--- 2/drivers/crypto/marvell/cesa.h
+++ b/drivers/crypto/marvell/cesa.h
@@@ -685,35 -688,14 +688,41 @@@ static inline u32 mv_cesa_get_int_mask(
        return engine->int_mask;
  }
  
+ static inline bool mv_cesa_mac_op_is_first_frag(const struct mv_cesa_op_ctx *op)
+ {
+       return (mv_cesa_get_op_cfg(op) & CESA_SA_DESC_CFG_FRAG_MSK) ==
+               CESA_SA_DESC_CFG_FIRST_FRAG;
+ }
+ 
  int mv_cesa_queue_req(struct crypto_async_request *req);
  
 +/*
 + * Helper function that indicates whether a crypto request needs to be
 + * cleaned up or not after being enqueued using mv_cesa_queue_req().
 + */
 +static inline int mv_cesa_req_needs_cleanup(struct crypto_async_request *req,
 +                                          int ret)
 +{
 +      /*
 +       * The queue still had some space, the request was queued
 +       * normally, so there's no need to clean it up.
 +       */
 +      if (ret == -EINPROGRESS)
 +              return false;
 +
 +      /*
 +       * The queue had not space left, but since the request is
 +       * flagged with CRYPTO_TFM_REQ_MAY_BACKLOG, it was added to
 +       * the backlog and will be processed later. There's no need to
 +       * clean it up.
 +       */
 +      if (ret == -EBUSY && req->flags & CRYPTO_TFM_REQ_MAY_BACKLOG)
 +              return false;
 +
 +      /* Request wasn't queued, we need to clean it up */
 +      return true;
 +}
 +
  /* TDMA functions */
  
  static inline void mv_cesa_req_dma_iter_init(struct mv_cesa_dma_iter *iter,

diff --cc drivers/crypto/marvell/cipher.c
Simple merge

diff --cc drivers/crypto/marvell/hash.c
Simple merge

diff --cc lib/mpi/mpicoder.c
Simple merge