Revert 101bd90 ("misc: rtsx: judge ASPM Mode to set PETXCFG Reg")

hramrach · heftig · commit 9f5d14646431 · 2023-10-06T21:47:44.000+02:00
References: boo#1214428 boo#1214397 Patch-mainline: Not yet, fix under discussion Causes inability to access Samsung NVMe drives. Source: https://bugzilla.kernel.org/show_bug.cgi?id=217802#c18 Cherry-picked-for: https://bugs.archlinux.org/task/79439
diff --git a/drivers/misc/cardreader/rts5228.c b/drivers/misc/cardreader/rts5228.c
@@ -400,6 +400,12 @@ static void rts5228_init_from_cfg(struct rtsx_pcr *pcr)
 		if (option->ltr_enabled)
 			rtsx_set_ltr_latency(pcr, option->ltr_active_latency);
 	}
+
+	if (rtsx_check_dev_flag(pcr, ASPM_L1_1_EN | ASPM_L1_2_EN
+				| PM_L1_1_EN | PM_L1_2_EN))
+		option->force_clkreq_0 = false;
+	else
+		option->force_clkreq_0 = true;
 }
 
 static int rts5228_extra_init_hw(struct rtsx_pcr *pcr)
diff --git a/drivers/misc/cardreader/rts5260.c b/drivers/misc/cardreader/rts5260.c
@@ -488,6 +488,12 @@ static void rts5260_init_from_cfg(struct rtsx_pcr *pcr)
 		if (option->ltr_enabled)
 			rtsx_set_ltr_latency(pcr, option->ltr_active_latency);
 	}
+
+	if (rtsx_check_dev_flag(pcr, ASPM_L1_1_EN | ASPM_L1_2_EN
+				| PM_L1_1_EN | PM_L1_2_EN))
+		option->force_clkreq_0 = false;
+	else
+		option->force_clkreq_0 = true;
 }
 
 static int rts5260_extra_init_hw(struct rtsx_pcr *pcr)
diff --git a/drivers/misc/cardreader/rts5261.c b/drivers/misc/cardreader/rts5261.c
@@ -460,6 +460,12 @@ static void rts5261_init_from_cfg(struct rtsx_pcr *pcr)
 		if (option->ltr_enabled)
 			rtsx_set_ltr_latency(pcr, option->ltr_active_latency);
 	}
+
+	if (rtsx_check_dev_flag(pcr, ASPM_L1_1_EN | ASPM_L1_2_EN
+				| PM_L1_1_EN | PM_L1_2_EN))
+		option->force_clkreq_0 = false;
+	else
+		option->force_clkreq_0 = true;
 }
 
 static int rts5261_extra_init_hw(struct rtsx_pcr *pcr)

Original file line number	Diff line number	Diff line change
`@@ -400,6 +400,12 @@ static void rts5228_init_from_cfg(struct rtsx_pcr *pcr)`
`400`	`400`	`if (option->ltr_enabled)`
`401`	`401`	`rtsx_set_ltr_latency(pcr, option->ltr_active_latency);`
`402`	`402`	`}`
	`403`	`+`
	`404`	`+ if (rtsx_check_dev_flag(pcr, ASPM_L1_1_EN \| ASPM_L1_2_EN`
	`405`	`+ \| PM_L1_1_EN \| PM_L1_2_EN))`
	`406`	`+ option->force_clkreq_0 = false;`
	`407`	`+ else`
	`408`	`+ option->force_clkreq_0 = true;`
`403`	`409`	`}`
`404`	`410`
`405`	`411`	`static int rts5228_extra_init_hw(struct rtsx_pcr *pcr)`
Original file line number	Diff line number	Diff line change
`@@ -488,6 +488,12 @@ static void rts5260_init_from_cfg(struct rtsx_pcr *pcr)`
`488`	`488`	`if (option->ltr_enabled)`
`489`	`489`	`rtsx_set_ltr_latency(pcr, option->ltr_active_latency);`
`490`	`490`	`}`
	`491`	`+`
	`492`	`+ if (rtsx_check_dev_flag(pcr, ASPM_L1_1_EN \| ASPM_L1_2_EN`
	`493`	`+ \| PM_L1_1_EN \| PM_L1_2_EN))`
	`494`	`+ option->force_clkreq_0 = false;`
	`495`	`+ else`
	`496`	`+ option->force_clkreq_0 = true;`
`491`	`497`	`}`
`492`	`498`
`493`	`499`	`static int rts5260_extra_init_hw(struct rtsx_pcr *pcr)`
Original file line number	Diff line number	Diff line change
`@@ -460,6 +460,12 @@ static void rts5261_init_from_cfg(struct rtsx_pcr *pcr)`
`460`	`460`	`if (option->ltr_enabled)`
`461`	`461`	`rtsx_set_ltr_latency(pcr, option->ltr_active_latency);`
`462`	`462`	`}`
	`463`	`+`
	`464`	`+ if (rtsx_check_dev_flag(pcr, ASPM_L1_1_EN \| ASPM_L1_2_EN`
	`465`	`+ \| PM_L1_1_EN \| PM_L1_2_EN))`
	`466`	`+ option->force_clkreq_0 = false;`
	`467`	`+ else`
	`468`	`+ option->force_clkreq_0 = true;`
`463`	`469`	`}`
`464`	`470`
`465`	`471`	`static int rts5261_extra_init_hw(struct rtsx_pcr *pcr)`