Fixes post .333

Bug 3823963 Bug 2969628 Bug 3819327 Change-Id: Id9669a42d74cb61c6dfbedd02f9315bc00c01e0d Signed-off-by: dmitry pervushin <[email protected]> Reviewed-on: https://git-master.nvidia.com/r/c/linux-4.9/+/2818587
OE4T · Dec 12, 2022 · 4bfe7f8 · 4bfe7f8
1 parent fc2667b
commit 4bfe7f8
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 606 deletions.
diff --git a/arch/arm64/kernel/process.c b/arch/arm64/kernel/process.c
@@ -190,7 +190,7 @@ static void show_data(unsigned long addr, int nbytes, const char *name)
 	if (addr < PAGE_OFFSET || addr > -256UL)
 		return;
 
-	printk("\n%s: %pS:\n", name, addr);
+	printk("\n%s: %pS:\n", name, (void*)addr);
 
 	/*
 	 * round address down to a 32 bit boundary

diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
@@ -3348,8 +3348,7 @@ int mmc_flush_cache(struct mmc_card *card)
 			(card->ext_csd.cache_size > 0) &&
 			(card->ext_csd.cache_ctrl & 1)) {
 		err = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,
-				EXT_CSD_FLUSH_CACHE, 1,
-				 MMC_CACHE_FLUSH_TIMEOUT_MS);
+				EXT_CSD_FLUSH_CACHE, 1, 0);
 		if (err)
 			pr_err("%s: cache flush error %d\n",
 					mmc_hostname(card->host), err);

diff --git a/drivers/mmc/core/mmc_ops.c b/drivers/mmc/core/mmc_ops.c
@@ -550,11 +550,13 @@ int __mmc_switch(struct mmc_card *card, u8 set, u8 index, u8 value,
 
 	/* We have an unspecified cmd timeout, use the fallback value. */
 	if (!timeout_ms) {
+#if 0
 		pr_warn("%s: unspecified timeout for CMD6 - use generic\n",
 			mmc_hostname(host));
-		timeout_ms = card->ext_csd.generic_cmd6_time;
+#endif
+		timeout_ms = 10 * 60 * 1000;
+		/* instead of card->ext_csd.generic_cmd6_time; */
 	}
-
 	/* Must check status to be sure of no errors. */
 	timeout = jiffies + msecs_to_jiffies(timeout_ms) + 1;
 	do {
@@ -588,7 +590,6 @@ int __mmc_switch(struct mmc_card *card, u8 set, u8 index, u8 value,
 			mmc_delay(timeout_ms);
 			goto out;
 		}
-
 		/* Timeout if the device never leaves the program state. */
 		if (expired &&
 		    (R1_CURRENT_STATE(status) == R1_STATE_PRG || busy)) {

diff --git a/drivers/usb/core/driver.c b/drivers/usb/core/driver.c
@@ -1366,7 +1366,8 @@ static int usb_suspend_both(struct usb_device *udev, pm_message_t msg)
 	}
 
  done:
-	dev_info(&udev->dev, "%s: status %d\n", __func__, status);
+	if (status != -EBUSY)
+		dev_info(&udev->dev, "%s: status %d\n", __func__, status);
 	return status;
 }
 

diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
@@ -1934,12 +1934,6 @@ static bool f2fs_dummy_context(struct inode *inode)
 	return DUMMY_ENCRYPTION_ENABLED(F2FS_I_SB(inode));
 }
 
-static unsigned f2fs_max_namelen(struct inode *inode)
-{
-	return S_ISLNK(inode->i_mode) ?
-			inode->i_sb->s_blocksize : F2FS_NAME_LEN;
-}
-
 static const struct fscrypt_operations f2fs_cryptops = {
 	.key_prefix	= "f2fs:",
 	.get_context	= f2fs_get_context,

diff --git a/include/trace/events/sched.h b/include/trace/events/sched.h
@@ -673,10 +673,10 @@ TRACE_EVENT(sched_load_avg_task,
 		  __entry->util_avg,
 		  __entry->util_fast_avg,
 		  __entry->util_avg_pelt,
-		  __entry->util_avg_walt,
-		  (u64)__entry->load_sum,
-		  (u32)__entry->util_sum,
-		  (u32)__entry->period_contrib)
+		  (unsigned long)__entry->util_avg_walt,
+		  (unsigned long long)__entry->load_sum,
+		  (unsigned int)__entry->util_sum,
+		  (unsigned int)__entry->period_contrib)
 );
 
 /*
@@ -716,7 +716,7 @@ TRACE_EVENT(sched_load_avg_cpu,
 			  "util_avg_pelt=%lu util_avg_walt=%lu",
 		  __entry->cpu, __entry->load_avg, __entry->util_avg,
 		  __entry->util_fast_avg,
-		  __entry->util_avg_pelt, __entry->util_avg_walt)
+		  __entry->util_avg_pelt, (unsigned long)__entry->util_avg_walt)
 );
 
 /*

diff --git a/kernel/memremap.c b/kernel/memremap.c
@@ -173,6 +173,8 @@ EXPORT_SYMBOL(devm_memunmap);
 #ifdef CONFIG_ZONE_DEVICE
 static DEFINE_MUTEX(pgmap_lock);
 static RADIX_TREE(pgmap_radix, GFP_KERNEL);
+#undef SECTION_MASK
+#undef SECTION_SIZE
 #define SECTION_MASK ~((1UL << PA_SECTION_SHIFT) - 1)
 #define SECTION_SIZE (1UL << PA_SECTION_SHIFT)
 

diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
@@ -3154,9 +3154,9 @@ static int hda_codec_force_resume(struct device *dev)
 	 * device hasn't been used at suspend time.  This trick is needed to
 	 * update the jack state change during the sleep.
 	 */
-	pm_runtime_get_noresume(dev);
+	// pm_runtime_get_noresume(dev);
 	ret = pm_runtime_force_resume(dev);
-	pm_runtime_put(dev);
+	// pm_runtime_put(dev);
 	return ret;
 }