lkml.org 
[lkml]   [2020]   [Jul]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5/5] misc: rtsx: Use standard PCI definitions
    Date
    From: Bjorn Helgaas <bhelgaas@google.com>

    When reading registers defined by the PCIe spec, use the names already
    defined by the PCI core. This makes maintenance of the PCI core and
    drivers easier. No functional change intended.

    Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
    ---
    drivers/misc/cardreader/rts5249.c | 8 ++++----
    drivers/misc/cardreader/rts5260.c | 8 ++++----
    drivers/misc/cardreader/rts5261.c | 8 ++++----
    include/linux/rtsx_pci.h | 5 -----
    4 files changed, 12 insertions(+), 17 deletions(-)

    diff --git a/drivers/misc/cardreader/rts5249.c b/drivers/misc/cardreader/rts5249.c
    index 1b8149e806c1..941b3d77f1e9 100644
    --- a/drivers/misc/cardreader/rts5249.c
    +++ b/drivers/misc/cardreader/rts5249.c
    @@ -105,16 +105,16 @@ static void rts5249_init_from_cfg(struct rtsx_pcr *pcr)

    pci_read_config_dword(pdev, l1ss + PCI_L1SS_CTL1, &lval);

    - if (lval & ASPM_L1_1_EN_MASK)
    + if (lval & PCI_L1SS_CTL1_ASPM_L1_1)
    rtsx_set_dev_flag(pcr, ASPM_L1_1_EN);

    - if (lval & ASPM_L1_2_EN_MASK)
    + if (lval & PCI_L1SS_CTL1_ASPM_L1_2)
    rtsx_set_dev_flag(pcr, ASPM_L1_2_EN);

    - if (lval & PM_L1_1_EN_MASK)
    + if (lval & PCI_L1SS_CTL1_PCIPM_L1_1)
    rtsx_set_dev_flag(pcr, PM_L1_1_EN);

    - if (lval & PM_L1_2_EN_MASK)
    + if (lval & PCI_L1SS_CTL1_PCIPM_L1_2)
    rtsx_set_dev_flag(pcr, PM_L1_2_EN);

    if (option->ltr_en) {
    diff --git a/drivers/misc/cardreader/rts5260.c b/drivers/misc/cardreader/rts5260.c
    index ebf77643cc90..b9f66b1384a6 100644
    --- a/drivers/misc/cardreader/rts5260.c
    +++ b/drivers/misc/cardreader/rts5260.c
    @@ -508,16 +508,16 @@ static void rts5260_init_from_cfg(struct rtsx_pcr *pcr)

    pci_read_config_dword(pdev, l1ss + PCI_L1SS_CTL1, &lval);

    - if (lval & ASPM_L1_1_EN_MASK)
    + if (lval & PCI_L1SS_CTL1_ASPM_L1_1)
    rtsx_set_dev_flag(pcr, ASPM_L1_1_EN);

    - if (lval & ASPM_L1_2_EN_MASK)
    + if (lval & PCI_L1SS_CTL1_ASPM_L1_2)
    rtsx_set_dev_flag(pcr, ASPM_L1_2_EN);

    - if (lval & PM_L1_1_EN_MASK)
    + if (lval & PCI_L1SS_CTL1_PCIPM_L1_1)
    rtsx_set_dev_flag(pcr, PM_L1_1_EN);

    - if (lval & PM_L1_2_EN_MASK)
    + if (lval & PCI_L1SS_CTL1_PCIPM_L1_2)
    rtsx_set_dev_flag(pcr, PM_L1_2_EN);

    rts5260_pwr_saving_setting(pcr);
    diff --git a/drivers/misc/cardreader/rts5261.c b/drivers/misc/cardreader/rts5261.c
    index 4b6e3fe4a007..471961487ff8 100644
    --- a/drivers/misc/cardreader/rts5261.c
    +++ b/drivers/misc/cardreader/rts5261.c
    @@ -423,22 +423,22 @@ static void rts5261_init_from_cfg(struct rtsx_pcr *pcr)

    pci_read_config_dword(pdev, l1ss + PCI_L1SS_CTL1, &lval);

    - if (lval & ASPM_L1_1_EN_MASK)
    + if (lval & PCI_L1SS_CTL1_ASPM_L1_1)
    rtsx_set_dev_flag(pcr, ASPM_L1_1_EN);
    else
    rtsx_clear_dev_flag(pcr, ASPM_L1_1_EN);

    - if (lval & ASPM_L1_2_EN_MASK)
    + if (lval & PCI_L1SS_CTL1_ASPM_L1_2)
    rtsx_set_dev_flag(pcr, ASPM_L1_2_EN);
    else
    rtsx_clear_dev_flag(pcr, ASPM_L1_2_EN);

    - if (lval & PM_L1_1_EN_MASK)
    + if (lval & PCI_L1SS_CTL1_PCIPM_L1_1)
    rtsx_set_dev_flag(pcr, PM_L1_1_EN);
    else
    rtsx_clear_dev_flag(pcr, PM_L1_1_EN);

    - if (lval & PM_L1_2_EN_MASK)
    + if (lval & PCI_L1SS_CTL1_PCIPM_L1_2)
    rtsx_set_dev_flag(pcr, PM_L1_2_EN);
    else
    rtsx_clear_dev_flag(pcr, PM_L1_2_EN);
    diff --git a/include/linux/rtsx_pci.h b/include/linux/rtsx_pci.h
    index f1e27b858972..9f70cdedb124 100644
    --- a/include/linux/rtsx_pci.h
    +++ b/include/linux/rtsx_pci.h
    @@ -1075,11 +1075,6 @@ struct pcr_ops {

    enum PDEV_STAT {PDEV_STAT_IDLE, PDEV_STAT_RUN};

    -#define ASPM_L1_1_EN_MASK BIT(3)
    -#define ASPM_L1_2_EN_MASK BIT(2)
    -#define PM_L1_1_EN_MASK BIT(1)
    -#define PM_L1_2_EN_MASK BIT(0)
    -
    #define ASPM_L1_1_EN BIT(0)
    #define ASPM_L1_2_EN BIT(1)
    #define PM_L1_1_EN BIT(2)
    --
    2.25.1
    \
     
     \ /
      Last update: 2020-07-21 23:24    [W:4.549 / U:0.344 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site