lkml.org 
[lkml]   [2023]   [Sep]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 06/13] Bluetooth: hci_bcm4377: Convert aspm disable to quirk
    Date
    pci_disable_link_state() was made reliable regardless of ASPM CONFIG
    and OS being disallowed to change ASPM states to allow drivers to rely
    on pci_disable_link_state() working.

    Remove driver working around unreliable pci_disable_link_state() from
    hci_bcm4377 driver and add a PCI quirk to disable ASPM.

    Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
    ---
    drivers/bluetooth/hci_bcm4377.c | 20 --------------------
    drivers/pci/quirks.c | 3 +++
    2 files changed, 3 insertions(+), 20 deletions(-)

    diff --git a/drivers/bluetooth/hci_bcm4377.c b/drivers/bluetooth/hci_bcm4377.c
    index 19ad0e788646..2348ee2380db 100644
    --- a/drivers/bluetooth/hci_bcm4377.c
    +++ b/drivers/bluetooth/hci_bcm4377.c
    @@ -490,7 +490,6 @@ struct bcm4377_data;
    * clear_pciecfg_subsystem_ctrl_bit19: Set to true if bit 19 in the
    * vendor-specific subsystem control
    * register has to be cleared
    - * disable_aspm: Set to true if ASPM must be disabled due to hardware errata
    * broken_ext_scan: Set to true if the chip erroneously claims to support
    * extended scanning
    * broken_mws_transport_config: Set to true if the chip erroneously claims to
    @@ -509,7 +508,6 @@ struct bcm4377_hw {

    unsigned long has_bar0_core2_window2 : 1;
    unsigned long clear_pciecfg_subsystem_ctrl_bit19 : 1;
    - unsigned long disable_aspm : 1;
    unsigned long broken_ext_scan : 1;
    unsigned long broken_mws_transport_config : 1;

    @@ -2222,20 +2220,6 @@ static int bcm4377_probe_of(struct bcm4377_data *bcm4377)
    return 0;
    }

    -static void bcm4377_disable_aspm(struct bcm4377_data *bcm4377)
    -{
    - pci_disable_link_state(bcm4377->pdev,
    - PCIE_LINK_STATE_L0S | PCIE_LINK_STATE_L1);
    -
    - /*
    - * pci_disable_link_state can fail if either CONFIG_PCIEASPM is disabled
    - * or if the BIOS hasn't handed over control to us. We must *always*
    - * disable ASPM for this device due to hardware errata though.
    - */
    - pcie_capability_clear_word(bcm4377->pdev, PCI_EXP_LNKCTL,
    - PCI_EXP_LNKCTL_ASPMC);
    -}
    -
    static void bcm4377_pci_free_irq_vectors(void *data)
    {
    pci_free_irq_vectors(data);
    @@ -2288,9 +2272,6 @@ static int bcm4377_probe(struct pci_dev *pdev, const struct pci_device_id *id)
    return -ENODEV;
    }

    - if (bcm4377->hw->disable_aspm)
    - bcm4377_disable_aspm(bcm4377);
    -
    ret = pci_reset_function_locked(pdev);
    if (ret)
    dev_warn(
    @@ -2448,7 +2429,6 @@ static const struct bcm4377_hw bcm4377_hw_variants[] = {
    .otp_offset = 0x4120,
    .bar0_window1 = 0x1800b000,
    .bar0_window2 = 0x1810c000,
    - .disable_aspm = true,
    .broken_ext_scan = true,
    .send_ptb = bcm4377_send_ptb,
    },
    diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
    index eeec1d6f9023..d6ab0e98013f 100644
    --- a/drivers/pci/quirks.c
    +++ b/drivers/pci/quirks.c
    @@ -2502,6 +2502,9 @@ static void quirk_disable_aspm_l0s_l1(struct pci_dev *dev)
    */
    DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ASMEDIA, 0x1080, quirk_disable_aspm_l0s_l1);

    +/* BCM4377 must always disable ASPM due to hardware errata. */
    +DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_BROADCOM, 0x5fa0, quirk_disable_aspm_l0s_l1);
    +
    /*
    * Some Pericom PCIe-to-PCI bridges in reverse mode need the PCIe Retrain
    * Link bit cleared after starting the link retrain process to allow this
    --
    2.30.2
    \
     
     \ /
      Last update: 2023-09-18 17:47    [W:6.212 / U:0.032 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site