Received: by 2002:a05:6a10:16a7:0:0:0:0 with SMTP id gp39csp380988pxb; Tue, 3 Nov 2020 01:58:55 -0800 (PST) X-Google-Smtp-Source: ABdhPJxZKGfE2oGO6bjiGOvEg0ZNBT4Kn2Xn4nLIotRm1BS/qClNzBbBuSoZhq3TXw6FjwgulAWp X-Received: by 2002:a05:6402:143:: with SMTP id s3mr20033176edu.267.1604397535437; Tue, 03 Nov 2020 01:58:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1604397535; cv=none; d=google.com; s=arc-20160816; b=ethj6nTJtFE04X+wPmAyvgUHy/oDNid2dgfqET+la8SU5nUC/TX0gdFb73KEZym1pG /XIxhlMgNuP9UwYnlFVHCcWxEWvxdQFuUGqJDYOM3fh2sdv3EhrsC/NHvpe9PEO27Lcy xr5sMXvZjgIN9Ibkr3segSsQ8TFoHqFWmJPL/SbQncJGE5AgC+eLtQBRhlKrVdaSFzSW MssOkCC/qhSoM5EL/gFSXOlFHyNn5JyjH9z/+lJiZ6gr1ArrjdtBd/IVWYFQ13K+tCKk kwRJLHu4rvoaSR7PTZRVcsXZcbQApGWDgTbYyltJohfHz/frcG86oBdKk6D2gwhB4o1r ep9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:date:subject:cc:to:from :authenticated-by; bh=fmH6qAE8U/ArtzK6hXOm1oU4i/3NBE55biT6yKT2rS0=; b=keSoARotyjHILDXVtM4snZisRsqYhXr8Rgmx8Rq+QX5A5MzDQC8mDiM946hX1OGtm0 FdeeAyNaVDgnvXiGt756drHC/oMZBH2WTmiIW/o8oNq2vd8/wROVKf9vuRhoKI8zVp+L MxpQFjUivSxDVCX62rtj3A8mJVWPo+YfgXj9Gkk3PRwSMwj6kNYZywPvlll4Bfh2AB5p Yx/mx7HVvHMn377weZRHUKLV5zs10UleuOdNGPgYxH+tPuIjxp1ERCAIZRGeVt+DZwT3 StD1AS1F982WujTMmYuemrUubzu4BIzyNgv2qJR5HBP0l9JgV70rxOyHJ0lWjF3TabyB 5AQQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id gb29si3042608ejc.439.2020.11.03.01.58.32; Tue, 03 Nov 2020 01:58:55 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727852AbgKCJyz (ORCPT + 99 others); Tue, 3 Nov 2020 04:54:55 -0500 Received: from rtits2.realtek.com ([211.75.126.72]:39276 "EHLO rtits2.realtek.com.tw" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727688AbgKCJyy (ORCPT ); Tue, 3 Nov 2020 04:54:54 -0500 Authenticated-By: X-SpamFilter-By: ArmorX SpamTrap 5.73 with qID 0A39skozF015340, This message is accepted by code: ctloc85258 Received: from RSEXMBS01.realsil.com.cn ([172.29.17.195]) by rtits2.realtek.com.tw (8.15.2/2.70/5.88) with ESMTPS id 0A39skozF015340 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT); Tue, 3 Nov 2020 17:54:47 +0800 Received: from localhost (172.29.40.150) by RSEXMBS01.realsil.com.cn (172.29.17.195) with Microsoft SMTP Server id 15.1.2044.4; Tue, 3 Nov 2020 17:54:46 +0800 From: To: , , CC: , , Rui Feng Subject: [PATCH 3/8] misc: rtsx: Fix aspm for RTS5261 Date: Tue, 3 Nov 2020 17:54:45 +0800 Message-ID: <1604397285-2850-1-git-send-email-rui_feng@realsil.com.cn> X-Mailer: git-send-email 1.9.1 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [172.29.40.150] Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Rui Feng This patch fix the bug that LDO is off when aspm is enabled. Signed-off-by: Rui Feng --- drivers/misc/cardreader/rts5261.c | 10 +++++++++- drivers/misc/cardreader/rts5261.h | 3 ++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/drivers/misc/cardreader/rts5261.c b/drivers/misc/cardreader/rts5261.c index 531bbaed7a12..3e30e542ef1a 100644 --- a/drivers/misc/cardreader/rts5261.c +++ b/drivers/misc/cardreader/rts5261.c @@ -530,22 +530,30 @@ static int rts5261_extra_init_hw(struct rtsx_pcr *pcr) static void rts5261_enable_aspm(struct rtsx_pcr *pcr, bool enable) { + u8 val = FORCE_ASPM_CTL0 | FORCE_ASPM_CTL1; + u8 mask = FORCE_ASPM_VAL_MASK | FORCE_ASPM_CTL0 | FORCE_ASPM_CTL1; + if (pcr->aspm_enabled == enable) return; + val |= (pcr->aspm_en & 0x02); + rtsx_pci_write_register(pcr, ASPM_FORCE_CTL, mask, val); pcie_capability_clear_and_set_word(pcr->pci, PCI_EXP_LNKCTL, PCI_EXP_LNKCTL_ASPMC, pcr->aspm_en); pcr->aspm_enabled = enable; - } static void rts5261_disable_aspm(struct rtsx_pcr *pcr, bool enable) { + u8 val = FORCE_ASPM_CTL0 | FORCE_ASPM_CTL1; + u8 mask = FORCE_ASPM_VAL_MASK | FORCE_ASPM_CTL0 | FORCE_ASPM_CTL1; + if (pcr->aspm_enabled == enable) return; pcie_capability_clear_and_set_word(pcr->pci, PCI_EXP_LNKCTL, PCI_EXP_LNKCTL_ASPMC, 0); + rtsx_pci_write_register(pcr, ASPM_FORCE_CTL, mask, val); rtsx_pci_write_register(pcr, SD_CFG1, SD_ASYNC_FIFO_NOT_RST, 0); udelay(10); pcr->aspm_enabled = enable; diff --git a/drivers/misc/cardreader/rts5261.h b/drivers/misc/cardreader/rts5261.h index 80179353bc46..cb98abb7c935 100644 --- a/drivers/misc/cardreader/rts5261.h +++ b/drivers/misc/cardreader/rts5261.h @@ -12,7 +12,8 @@ /*New add*/ #define rts5261_vendor_setting_valid(reg) ((reg) & 0x010000) -#define rts5261_reg_to_aspm(reg) (((reg) >> 28) ^ 0x03) +#define rts5261_reg_to_aspm(reg) \ + (((~(reg) >> 28) & 0x02) | (((reg) >> 28) & 0x01)) #define rts5261_reg_check_reverse_socket(reg) ((reg) & 0x04) #define rts5261_reg_to_card_drive_sel(reg) ((((reg) >> 6) & 0x01) << 6) #define rts5261_reg_to_sd30_drive_sel_1v8(reg) (((reg) >> 22) ^ 0x03) -- 2.17.1