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;
Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates
 216.228.112.34 as permitted sender) receiver=protection.outlook.com;
 client-ip=216.228.112.34; helo=mail.nvidia.com;
Subject: Re: [PATCH] PCI: tegra: Disable PTM capabilities for EP mode
To:     Vidya Sagar <vidyas@nvidia.com>, Bjorn Helgaas <helgaas@kernel.org>
CC:     <jingoohan1@gmail.com>, <gustavo.pimentel@synopsys.com>,
        <lorenzo.pieralisi@arm.com>, <amurray@thegoodpenguin.co.uk>,
        <bhelgaas@google.com>, <kishon@ti.com>, <thierry.reding@gmail.com>,
        <Jisheng.Zhang@synaptics.com>, <jonathanh@nvidia.com>,
        <linux-pci@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
        <kthota@nvidia.com>, <mmaddireddy@nvidia.com>,
        <oop.singh@gmail.com>
References: <20210305121934.GA1067436@bjorn-Precision-5520>
 <81c84df2-e52b-7713-5026-c3e0a27376bd@nvidia.com>
From:   Om Prakash Singh <omp@nvidia.com>
Message-ID: <26834aba-4d45-6da4-0548-1fb61e684b59@nvidia.com>
Date:   Mon, 8 Mar 2021 16:12:55 +0530
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101
 Thunderbird/78.7.1
MIME-Version: 1.0
In-Reply-To: <81c84df2-e52b-7713-5026-c3e0a27376bd@nvidia.com>
Content-Type: text/plain; charset="utf-8"
Content-Language: en-US
Content-Transfer-Encoding: 8bit
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Mar 2021 10:43:04.9149
 (UTC)
X-MS-Exchange-CrossTenant-Network-Message-Id: 3d21c63a-3b01-46ad-a457-08d8e21ef466
X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a
X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.112.34];Helo=[mail.nvidia.com]
X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT060.eop-nam11.prod.protection.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Anonymous
X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB2716
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On 3/5/2021 11:43 PM, Vidya Sagar wrote:
> 
> 
> On 3/5/2021 5:49 PM, Bjorn Helgaas wrote:
>> External email: Use caution opening links or attachments
>>
>>
>> On Fri, Mar 05, 2021 at 01:42:34PM +0530, Om Prakash Singh wrote:
>>> PCIe EP compliance expect PTM capabilities (ROOT_CAPABLE, RES_CAPABLE,
>>> CLK_GRAN) to be disabled.
>>
>> I guess this is just enforcing the PCIe spec requirements that only
>> Root Ports, RCRBs, and Switches are allowed to set the PTM Responder
>> Capable bit, and that the Local Clock Granularity is RsvdP if PTM Root
>> Capable is zero?  (PCIe r5.0, sec 7.9.16.2)
>>
>> Should this be done more generally somewhere in the dwc code as
>> opposed to in the tegra code?
> Agree.
>
I'll take care of this in next patch version
 
>>
>>> Signed-off-by: Om Prakash Singh <omp@nvidia.com>
>>> ---
>>>   drivers/pci/controller/dwc/pcie-tegra194.c | 17 ++++++++++++++++-
>>>   include/uapi/linux/pci_regs.h              |  1 +
>>>   2 files changed, 17 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/drivers/pci/controller/dwc/pcie-tegra194.c b/drivers/pci/controller/dwc/pcie-tegra194.c
>>> index 6fa216e..a588312 100644
>>> --- a/drivers/pci/controller/dwc/pcie-tegra194.c
>>> +++ b/drivers/pci/controller/dwc/pcie-tegra194.c
>>> @@ -1639,7 +1639,7 @@ static void pex_ep_event_pex_rst_deassert(struct tegra_pcie_dw *pcie)
>>>        struct dw_pcie *pci = &pcie->pci;
>>>        struct dw_pcie_ep *ep = &pci->ep;
>>>        struct device *dev = pcie->dev;
>>> -     u32 val;
>>> +     u32 val, ptm_cap_base = 0;
>>
>> Unnecessary init.
>>
>>>        int ret;
>>>
>>>        if (pcie->ep_state == EP_STATE_ENABLED)
>>> @@ -1760,6 +1760,21 @@ static void pex_ep_event_pex_rst_deassert(struct tegra_pcie_dw *pcie)
>>>                                                      PCI_CAP_ID_EXP);
>>>        clk_set_rate(pcie->core_clk, GEN4_CORE_CLK_FREQ);
>>>
>>> +     /* Disable PTM root and responder capability */
>>> +     ptm_cap_base = dw_pcie_find_ext_capability(&pcie->pci,
>>> +                                                PCI_EXT_CAP_ID_PTM);
>>> +     if (ptm_cap_base) {
>>> +             dw_pcie_dbi_ro_wr_en(pci);
>>> +             val = dw_pcie_readl_dbi(pci, ptm_cap_base + PCI_PTM_CAP);
>>> +             val &= ~PCI_PTM_CAP_ROOT;
>>> +             dw_pcie_writel_dbi(pci, ptm_cap_base + PCI_PTM_CAP, val);
>>> +
>>> +             val = dw_pcie_readl_dbi(pci, ptm_cap_base + PCI_PTM_CAP);
>>> +             val &= ~(PCI_PTM_CAP_RES | PCI_PTM_GRANULARITY_MASK);
> Why can't this be clubbed with "val &= ~PCI_PTM_CAP_ROOT;" ?
>
This cannot be clubbed as PTM root capability needs to disable first before disabling responded capability 
 
>>> +             dw_pcie_writel_dbi(pci, ptm_cap_base + PCI_PTM_CAP, val);
>>> +             dw_pcie_dbi_ro_wr_dis(pci);
>>> +     }
>>> +
>>>        val = (ep->msi_mem_phys & MSIX_ADDR_MATCH_LOW_OFF_MASK);
>>>        val |= MSIX_ADDR_MATCH_LOW_OFF_EN;
>>>        dw_pcie_writel_dbi(pci, MSIX_ADDR_MATCH_LOW_OFF, val);
>>> diff --git a/include/uapi/linux/pci_regs.h b/include/uapi/linux/pci_regs.h
>>> index e709ae8..9dd6f8d 100644
>>> --- a/include/uapi/linux/pci_regs.h
>>> +++ b/include/uapi/linux/pci_regs.h
>>> @@ -1050,6 +1050,7 @@
>>>   /* Precision Time Measurement */
>>>   #define PCI_PTM_CAP                  0x04        /* PTM Capability */
>>>   #define  PCI_PTM_CAP_REQ             0x00000001  /* Requester capable */
>>> +#define  PCI_PTM_CAP_RES             0x00000002  /* Responder capable */
>>>   #define  PCI_PTM_CAP_ROOT            0x00000004  /* Root capable */
>>>   #define  PCI_PTM_GRANULARITY_MASK    0x0000FF00  /* Clock granularity */
>>>   #define PCI_PTM_CTRL                 0x08        /* PTM Control */
>>> -- 
>>> 2.7.4
>>>