Merge branch 'esmil:starlight' into jh7100

esmil · May 22, 2021 · d6cdde6 · d6cdde6
2 parents 0dd400e + a22fc12
commit d6cdde6
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/arch/riscv/configs/starlight_defconfig b/arch/riscv/configs/starlight_defconfig
@@ -32,6 +32,7 @@ CONFIG_SHUFFLE_PAGE_ALLOCATOR=y
 CONFIG_SOC_STARFIVE_VIC7100=y
 CONFIG_SMP=y
 CONFIG_NR_CPUS=4
+# CONFIG_RISCV_SBI_V01 is not set
 CONFIG_PM=y
 CONFIG_JUMP_LABEL=y
 # CONFIG_STACKPROTECTOR is not set
@@ -44,6 +45,7 @@ CONFIG_PARTITION_ADVANCED=y
 CONFIG_IOSCHED_BFQ=y
 CONFIG_KSM=y
 CONFIG_CMA=y
+CONFIG_ZSMALLOC=y
 CONFIG_NET=y
 CONFIG_PACKET=y
 CONFIG_UNIX=y
@@ -71,6 +73,8 @@ CONFIG_MTD_BLOCK=y
 CONFIG_MTD_PARTITIONED_MASTER=y
 CONFIG_MTD_SPI_NOR=y
 # CONFIG_MTD_SPI_NOR_USE_4K_SECTORS is not set
+CONFIG_ZRAM=y
+CONFIG_ZRAM_MEMORY_TRACKING=y
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_LOOP_MIN_COUNT=1
 CONFIG_BLK_DEV_NBD=y
@@ -176,7 +180,7 @@ CONFIG_NLS_CODEPAGE_437=y
 CONFIG_NLS_ISO8859_15=y
 CONFIG_NLS_UTF8=y
 CONFIG_LSM=""
-CONFIG_CRYPTO_AUTHENC=y
+CONFIG_CRYPTO_ZSTD=y
 # CONFIG_CRYPTO_HW is not set
 # CONFIG_RAID6_PQ_BENCHMARK is not set
 CONFIG_DMA_CMA=y

diff --git a/drivers/soc/sifive/sifive_l2_cache.c b/drivers/soc/sifive/sifive_l2_cache.c
@@ -143,8 +143,8 @@ void sifive_l2_flush64_range(unsigned long start, unsigned long len)
 	if(start < CONFIG_SIFIVE_L2_FLUSH_START ||
 	   (start + len) > (CONFIG_SIFIVE_L2_FLUSH_START +
 			     CONFIG_SIFIVE_L2_FLUSH_SIZE)) {
-		pr_warn("L2CACHE: flush64 out of range: %lx(%lx), skip flush\n",
-			start, len);
+		WARN(1, "L2CACHE: flush64 out of range: %lx(%lx), skip flush\n",
+		     start, len);
 		return;
 	}
 

diff --git a/include/linux/usb.h b/include/linux/usb.h
@@ -1617,9 +1617,8 @@ static inline void cdns_flush_dcache(unsigned long start, unsigned long len)
 
 static inline void cdns_virt_flush_dcache(void *virt_start, unsigned long len)
 {
-	unsigned long start = dw_virt_to_phys(virt_start);
-
-	starfive_flush_dcache(_ALIGN_DOWN(start, 64), len + (start & 63));
+	if (virt_start != NULL)
+		cdns_flush_dcache(dw_virt_to_phys(virt_start), len);
 }
 #endif
 /* ----------------------------------------------------------------------- */