diff mbox series

[v4] Fixes: misc: rtsx: init value of aspm_enabled

Message ID 20210122081906.19100-1-ricky_wu@realtek.com
State Accepted
Commit 31b081066e9c8f4a931a3d20dc0c6ca63c595c44
Headers show
Series [v4] Fixes: misc: rtsx: init value of aspm_enabled | expand

Commit Message

Ricky WU Jan. 22, 2021, 8:19 a.m. UTC 
From: Ricky Wu <ricky_wu@realtek.com>

make sure ASPM state sync with pcr->aspm_enabled
init value pcr->aspm_enabled

Cc: stable@vger.kernel.org
Signed-off-by: Ricky Wu <ricky_wu@realtek.com>
---

v2: fixed conditions in v1 if-statement
v3: give description for v1 and v2
v4: move version change below ---
---
 drivers/misc/cardreader/rtsx_pcr.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

Comments

Greg Kroah-Hartman Jan. 22, 2021, 10:03 a.m. UTC | #1 
On Fri, Jan 22, 2021 at 09:55:44AM +0000, 吳昊澄 Ricky wrote:
> > -----Original Message-----
> > From: Greg KH <gregkh@linuxfoundation.org>
> > Sent: Friday, January 22, 2021 4:28 PM
> > To: 吳昊澄 Ricky <ricky_wu@realtek.com>
> > Cc: arnd@arndb.de; bhelgaas@google.com; vaibhavgupta40@gmail.com;
> > linux-kernel@vger.kernel.org; stable@vger.kernel.org
> > Subject: Re: [PATCH v4] Fixes: misc: rtsx: init value of aspm_enabled
> > 
> > On Fri, Jan 22, 2021 at 04:19:06PM +0800, ricky_wu@realtek.com wrote:
> > > From: Ricky Wu <ricky_wu@realtek.com>
> > >
> > > make sure ASPM state sync with pcr->aspm_enabled init value
> > > pcr->aspm_enabled
> > >
> > > Cc: stable@vger.kernel.org
> > > Signed-off-by: Ricky Wu <ricky_wu@realtek.com>
> > > ---
> > >
> > > v2: fixed conditions in v1 if-statement
> > > v3: give description for v1 and v2
> > > v4: move version change below ---
> > 
> > What commit id does this fix?  How far back should the stable backporting go?
> > That's what we use the Fixes: line for.
> > 
> I think I misunderstanding you
> Fix commit id:  d928061c3143de36c17650ce7b60760fefb8336c
> So I need to have v5 and add "Fixes:" tag like below in the signed off by area?

Yes.  See the many hundreds of examples of this on the mailing lists and
in the git log :)

> "Fixes: d928061c3143de36c17650ce7b60760fefb8336c"

It should be:
Fixes: d928061c3143 ("misc: rtsx: modify en/disable aspm function")

The submitting patches document should explain how to do that.

I can go and add it by hand for this, but next time, try to remember to
do it yourself.

thanks,

greg k-h
diff mbox series

Patch

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);