* [PATCH v3] misc: rtsx: init value of aspm_enabled
@ 2021-01-22 3:33 ricky_wu
2021-01-22 7:28 ` Greg KH
2021-01-22 7:28 ` Greg KH
0 siblings, 2 replies; 3+ messages in thread
From: ricky_wu @ 2021-01-22 3:33 UTC (permalink / raw)
To: arnd, gregkh, bhelgaas, ricky_wu, vaibhavgupta40, linux-kernel; +Cc: stable
From: Ricky Wu <ricky_wu@realtek.com>
v1:
make sure ASPM state sync with pcr->aspm_enabled
init value pcr->aspm_enabled
v2:
fixes conditions in v1 if-statement
v3:
more description for v1 and v2
Cc: stable@vger.kernel.org
Signed-off-by: Ricky Wu <ricky_wu@realtek.com>
---
drivers/misc/cardreader/rtsx_pcr.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/drivers/misc/cardreader/rtsx_pcr.c b/drivers/misc/cardreader/rtsx_pcr.c
index 2aa6648fa41f..5a491d2cd1ae 100644
--- a/drivers/misc/cardreader/rtsx_pcr.c
+++ b/drivers/misc/cardreader/rtsx_pcr.c
@@ -1512,6 +1512,7 @@ static int rtsx_pci_probe(struct pci_dev *pcidev,
struct pcr_handle *handle;
u32 base, len;
int ret, i, bar = 0;
+ u8 val;
dev_dbg(&(pcidev->dev),
": Realtek PCI-E Card Reader found at %s [%04x:%04x] (rev %x)\n",
@@ -1577,7 +1578,11 @@ static int rtsx_pci_probe(struct pci_dev *pcidev,
pcr->host_cmds_addr = pcr->rtsx_resv_buf_addr;
pcr->host_sg_tbl_ptr = pcr->rtsx_resv_buf + HOST_CMDS_BUF_LEN;
pcr->host_sg_tbl_addr = pcr->rtsx_resv_buf_addr + HOST_CMDS_BUF_LEN;
-
+ rtsx_pci_read_register(pcr, ASPM_FORCE_CTL, &val);
+ if (val & FORCE_ASPM_CTL0 && val & FORCE_ASPM_CTL1)
+ pcr->aspm_enabled = false;
+ else
+ pcr->aspm_enabled = true;
pcr->card_inserted = 0;
pcr->card_removed = 0;
INIT_DELAYED_WORK(&pcr->carddet_work, rtsx_pci_card_detect);
--
2.17.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v3] misc: rtsx: init value of aspm_enabled
2021-01-22 3:33 [PATCH v3] misc: rtsx: init value of aspm_enabled ricky_wu
@ 2021-01-22 7:28 ` Greg KH
2021-01-22 7:28 ` Greg KH
1 sibling, 0 replies; 3+ messages in thread
From: Greg KH @ 2021-01-22 7:28 UTC (permalink / raw)
To: ricky_wu; +Cc: arnd, bhelgaas, vaibhavgupta40, linux-kernel, stable
On Fri, Jan 22, 2021 at 11:33:48AM +0800, ricky_wu@realtek.com wrote:
> From: Ricky Wu <ricky_wu@realtek.com>
>
> v1:
> make sure ASPM state sync with pcr->aspm_enabled
> init value pcr->aspm_enabled
> v2:
> fixes conditions in v1 if-statement
> v3:
> more description for v1 and v2
This needs to go below the --- line.
And there is no description of what the patch does anymore :(
Please fix up and do a v4.
thanks,
greg k-h
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v3] misc: rtsx: init value of aspm_enabled
2021-01-22 3:33 [PATCH v3] misc: rtsx: init value of aspm_enabled ricky_wu
2021-01-22 7:28 ` Greg KH
@ 2021-01-22 7:28 ` Greg KH
1 sibling, 0 replies; 3+ messages in thread
From: Greg KH @ 2021-01-22 7:28 UTC (permalink / raw)
To: ricky_wu; +Cc: arnd, bhelgaas, vaibhavgupta40, linux-kernel, stable
On Fri, Jan 22, 2021 at 11:33:48AM +0800, ricky_wu@realtek.com wrote:
> From: Ricky Wu <ricky_wu@realtek.com>
>
> v1:
> make sure ASPM state sync with pcr->aspm_enabled
> init value pcr->aspm_enabled
> v2:
> fixes conditions in v1 if-statement
> v3:
> more description for v1 and v2
>
> Cc: stable@vger.kernel.org
> Signed-off-by: Ricky Wu <ricky_wu@realtek.com>
> ---
> drivers/misc/cardreader/rtsx_pcr.c | 7 ++++++-
> 1 file changed, 6 insertions(+), 1 deletion(-)
Also, you forgot a "Fixes:" tag.
thanks,
greg k-h
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-01-22 7:30 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-22 3:33 [PATCH v3] misc: rtsx: init value of aspm_enabled ricky_wu
2021-01-22 7:28 ` Greg KH
2021-01-22 7:28 ` Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).