Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <02f878e7-e83e-ff17-1cd4-c2d54eda4dbd@nvidia.com>
Date:   Fri, 8 Jul 2022 15:49:10 +0530
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101
 Thunderbird/91.3.2
Subject: Re: [PATCH] PCI: designware-ep: Move DBI access to init_complete if
 notifier is used
Content-Language: en-US
To:     Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>,
        kishon@ti.com, bhelgaas@google.com, robh@kernel.org,
        lorenzo.pieralisi@arm.com
Cc:     kw@linux.com, linux-pci@vger.kernel.org,
        linux-kernel@vger.kernel.org,
        Kunihiko Hayashi <hayashi.kunihiko@socionext.com>,
        Om Prakash Singh <omp@nvidia.com>
References: <20220330060515.22328-1-manivannan.sadhasivam@linaro.org>
 <20220427101820.GC2536@thinkpad> <20220707165751.GB5458@thinkpad>
From:   Vidya Sagar <vidyas@nvidia.com>
In-Reply-To: <20220707165751.GB5458@thinkpad>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 8bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?MUJQalNYVVMxREx6SXZTTzlJY3J0WllISXQ2UzVNMVU0a0dsWXFCVnBpOXFk?=
 =?utf-8?B?K0plemw3QlFHaHRjUSt1bEJXWEs1QTNaRmczbW92Yy8vOGFFNkRteHlPUjho?=
 =?utf-8?B?SGFBcXFDVDNNZEMvQjNaRWYwc0c3anR0VGhCYzZmZGFOSkNET2ZaSFdUVlA5?=
 =?utf-8?B?N1NCSzNHcWl3cytiY1pPUUNYdEgrd0lPbzdFN0xGSEFFZW5neWhpQTg4Z3Ft?=
 =?utf-8?B?YWY4enZTUElvUlUwSTZRN2pYcCtXbDJLNFhHNWtTb3owT1Y5STNXelJMY2tU?=
 =?utf-8?B?d1h5Znd6MTI4dGlqbEMyUVVaWldKclg2dXcwLysweDloOVRVaG91cEFPbW93?=
 =?utf-8?B?U2pBYzgzUitFcEtUSWFZZk1vK29ld3BFbXFCU1dXU1hJSEx6SzB4eFkxeFZa?=
 =?utf-8?B?R0t4bU55anNoUWdOMU1JdnFQdVVGNmNqQU9jcklZOFlxM1l3WW5GUWFSenFW?=
 =?utf-8?B?T201NWJ1VVFzaE9Ya3F3WDdxcUxqSk5uMWQyZEZBWUVXN2lieitpU3M5SUkv?=
 =?utf-8?B?cHZvajg4d29FQklrNDV4NFd0c0pDMllUcDYycEprYklNNUhiL1RNZE5RTGVk?=
 =?utf-8?B?ZTZGa0JlMUsyWXhPaUJJNFluNWpTdGEwUmJGMUR2ZkwvcVpsV1NSdGgxc3VW?=
 =?utf-8?B?M1NFaEh2Nnpja0p3UElwTkNlTzBkVVpkVEkydjIvMFJPWTc5S0RCL0RxVDYw?=
 =?utf-8?B?SlJWK3JwdXdPWFpKS2NqRXd3b1g2eEFUVVpnbmkrTUE4MXV0ckxISEZnSTYx?=
 =?utf-8?B?MXYwcE8yYlhzR3VZQkwrdVprUGM3QlBMS2NScDZmdnN0enFWakNuaFRWZ3J1?=
 =?utf-8?B?Nmc0bTFHQkZpQTIyZjBFeDdveVVZRTMwOHdHNDA0WmlGQ09kUW5yRXVWakNz?=
 =?utf-8?B?RjlSbHRMZnBObDZmWEpEdVgrR2Q0Wmh4aGdvMW5ZeU03Z2NvclZVWmxKaThP?=
 =?utf-8?B?MlQ1M0Q1Zzhacy80OUQwUEMyTUw0eEZXU2VhVW5XNnBjcmdkSmU3NEZXR3V6?=
 =?utf-8?B?YysraWllR2dQU0dRRHFoUzdaOW1hck5VZ2hlMFNvbXliQ082clY0NTQ5OGxH?=
 =?utf-8?B?MEFNdXBmR1lWakNNNmFTVG0vcVphSXRsU3IxZTRxK3c3b2QwVTFyOG55QUtx?=
 =?utf-8?B?M2hxdWhvRGpwVnF3MHZyNmhYMW1VT2V5SFM3UTUveVNsZTUySG5TV1R2dXk2?=
 =?utf-8?B?M09waTYza3lpcUZ3VTZ3T0FEVEc3VlpFYkpZMzBXZUJucVNRNHpWcGMvNlFl?=
 =?utf-8?B?SkpBU3R3ZnFiRy9scGpKc3liQXNJZVFrQzY0TFJKQnZIV1UvNTJmR1hrMU9w?=
 =?utf-8?B?TVhrMlJXRVR4UmxHVmV3RDc4cHMraEU3d1A1QTNEWitFZHNwdmFJQ2ZMS1pv?=
 =?utf-8?B?MzcvNVkydmprTnFDcmpnV2lZQUxBZ1QvblN5V05FVVhsSGs0dDhHbm9jbW5n?=
 =?utf-8?B?cTRqellTU1hJYWZpaHZ0dk5TYzYyT2E4TmpkRnNLNXI5b3hsTkVkYkNmTy96?=
 =?utf-8?B?ajVNQTF6VEg0ZmwzTWhvOW8xNDhqZWYrMndoQncxN2kwMmt5NURlV3lRNlVX?=
 =?utf-8?B?c2NEYzlxcVkxcjAyd3pNdE52YXo4bnhhU1RVUXIxY0ZVUVRYT3htbDQ2U3lH?=
 =?utf-8?B?NVRzb05NZWc0WDI0WWdjSTBaQnloV25aRmdCWWZJeDdxdzRtNC8zVC80QThh?=
 =?utf-8?B?bVJ2cFBPRVI2ajg4OTRXNHBhaFNOaGNGcnpxWjJSYkNVZmFLbWI5aE9UN3Z3?=
 =?utf-8?B?SmVsTnNaNGs5V2Z6ZUtKUFM1Nm9waTh2VjRvenNjTXByMGVPNVJDd2F0S3ow?=
 =?utf-8?B?bWFGelV6YW1VUFRWTXJFd3dZLzJPZzVIZSszMk5tL0JIb28vc29GNU04ZXoz?=
 =?utf-8?B?dWM4ZndiUnJNZjNHaW5DN291Wk1FMzFFMUtoMFQvS2MvVGMrVU1pdnMwaGdl?=
 =?utf-8?B?VFZTdHhPUHltTkZVVCtWMkZKTldUTjdtc2JQR3JTL1JNYldhVG1PR3puMVJ6?=
 =?utf-8?B?SFZJM2tNUkp1WUFic0xCNGFVZk12TTQrbXE5Q0o2UEdYOEZMci9Xdkg5ZmJG?=
 =?utf-8?B?eERTN1poUlRXT0ovbDQ2OFJmemlzRWJ5Z3dWdWFsTE1JcGQ5NjMxa2cvZ295?=
 =?utf-8?Q?SXq4ftETTWaLp1uFgTeA8eHnn?=
X-OriginatorOrg: Nvidia.com
X-MS-Exchange-CrossTenant-Network-Message-Id: fa8e2592-09bf-4f89-cf72-08da60cb53d7
X-MS-Exchange-CrossTenant-AuthSource: BN8PR12MB2900.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Jul 2022 10:19:23.1063
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: dTuqJJU12FehpAsmvK47XvL8HQRqOu/oFcmqG94UKXNTPifDlCF1v1BP7jQwoquTWGwX3TZc7WqS4/G7f3edHA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB6355
X-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO,
        NICE_REPLY_A,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,
        SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no
        version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

I have a minor comment. Otherwise this patch looks fine.
I verified it on Tegra194 and it works as expected.

Reviewed-by: Vidya Sagar <vidyas@nvidia.com>
Tested-by: Vidya Sagar <vidyas@nvidia.com>

On 7/7/2022 10:27 PM, Manivannan Sadhasivam wrote:
> External email: Use caution opening links or attachments
> 
> 
> On Wed, Apr 27, 2022 at 03:48:26PM +0530, Manivannan Sadhasivam wrote:
>> On Wed, Mar 30, 2022 at 11:35:15AM +0530, Manivannan Sadhasivam wrote:
>>> For controllers supporting the CORE_INIT notifier, the resources are
>>> supposed to be enabled in the init_complete function. Currently,
>>> these controllers are enabling the resources during probe time due to
>>> the DBI access happens in dw_pcie_ep_init().
>>>
>>> This creates the dependency with the host PCIe controller since the
>>> resource enablement like PHY depends on host PCIe to be up. For the
>>> standalone endpoint usecase, this would never work. So let's move all DBI
>>> access to init_complete function if CORE_INIT notifier is used. For the
>>> controllers those doesn't support this notifier, this change is a NO-OP.
>>>
>>> Cc: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
>>> Cc: Om Prakash Singh <omp@nvidia.com>
>>> Cc: Vidya Sagar <vidyas@nvidia.com>
>>> Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
>>
>> A gentle ping on this patch!
>>
> 
> Ping again!
> 
> Thanks,
> Mani
> 
>> Thanks,
>> Mani
>>
>>> ---
>>>   .../pci/controller/dwc/pcie-designware-ep.c   | 138 ++++++++++++------
>>>   drivers/pci/controller/dwc/pcie-designware.h  |   1 +
>>>   2 files changed, 94 insertions(+), 45 deletions(-)
>>>
>>> diff --git a/drivers/pci/controller/dwc/pcie-designware-ep.c b/drivers/pci/controller/dwc/pcie-designware-ep.c
>>> index 0eda8236c125..fb2bf4bf5ba0 100644
>>> --- a/drivers/pci/controller/dwc/pcie-designware-ep.c
>>> +++ b/drivers/pci/controller/dwc/pcie-designware-ep.c
>>> @@ -636,6 +636,63 @@ static unsigned int dw_pcie_ep_find_ext_capability(struct dw_pcie *pci, int cap)
>>>      return 0;
>>>   }
>>>
>>> +static int dw_pcie_iatu_config(struct dw_pcie_ep *ep)

How about using dw_pcie_ep_iatu_config() name? Just added 'ep' to be in 
sync with other API names in this file.

>>> +{
>>> +   struct dw_pcie *pci = to_dw_pcie_from_ep(ep);
>>> +   struct device *dev = pci->dev;
>>> +   void *addr;
>>> +
>>> +   dw_pcie_iatu_detect(pci);
>>> +
>>> +   ep->ib_window_map = devm_kcalloc(dev,
>>> +                                    BITS_TO_LONGS(pci->num_ib_windows),
>>> +                                    sizeof(long),
>>> +                                    GFP_KERNEL);
>>> +   if (!ep->ib_window_map)
>>> +           return -ENOMEM;
>>> +
>>> +   ep->ob_window_map = devm_kcalloc(dev,
>>> +                                    BITS_TO_LONGS(pci->num_ob_windows),
>>> +                                    sizeof(long),
>>> +                                    GFP_KERNEL);
>>> +   if (!ep->ob_window_map)
>>> +           return -ENOMEM;
>>> +
>>> +   addr = devm_kcalloc(dev, pci->num_ob_windows, sizeof(phys_addr_t),
>>> +                       GFP_KERNEL);
>>> +   if (!addr)
>>> +           return -ENOMEM;
>>> +
>>> +   ep->outbound_addr = addr;
>>> +
>>> +   return 0;
>>> +}
>>> +
>>> +static int dw_pcie_ep_func_init(struct dw_pcie_ep *ep)
>>> +{
>>> +   struct dw_pcie *pci = to_dw_pcie_from_ep(ep);
>>> +   struct dw_pcie_ep_func *ep_func;
>>> +   struct pci_epc *epc = ep->epc;
>>> +   struct device *dev = pci->dev;
>>> +   u8 func_no;
>>> +
>>> +   for (func_no = 0; func_no < epc->max_functions; func_no++) {
>>> +           ep_func = devm_kzalloc(dev, sizeof(*ep_func), GFP_KERNEL);
>>> +           if (!ep_func)
>>> +                   return -ENOMEM;
>>> +
>>> +           ep_func->func_no = func_no;
>>> +           ep_func->msi_cap = dw_pcie_ep_find_capability(ep, func_no,
>>> +                                                         PCI_CAP_ID_MSI);
>>> +           ep_func->msix_cap = dw_pcie_ep_find_capability(ep, func_no,
>>> +                                                          PCI_CAP_ID_MSIX);
>>> +
>>> +           list_add_tail(&ep_func->list, &ep->func_list);
>>> +   }
>>> +
>>> +   return 0;
>>> +}
>>> +
>>>   int dw_pcie_ep_init_complete(struct dw_pcie_ep *ep)
>>>   {
>>>      struct dw_pcie *pci = to_dw_pcie_from_ep(ep);
>>> @@ -643,7 +700,22 @@ int dw_pcie_ep_init_complete(struct dw_pcie_ep *ep)
>>>      unsigned int nbars;
>>>      u8 hdr_type;
>>>      u32 reg;
>>> -   int i;
>>> +   int ret, i;
>>> +
>>> +   if (ep->core_init_notifier) {
>>> +           ret = dw_pcie_iatu_config(ep);
>>> +           if (ret)
>>> +                   return ret;
>>> +   }
>>> +
>>> +   if (ep->core_init_notifier) {
>>> +           ret = dw_pcie_ep_func_init(ep);
>>> +           if (ret)
>>> +                   return ret;
>>> +
>>> +           if (ep->ops->ep_init)
>>> +                   ep->ops->ep_init(ep);
>>> +   }
>>>
>>>      hdr_type = dw_pcie_readb_dbi(pci, PCI_HEADER_TYPE) &
>>>                 PCI_HEADER_TYPE_MASK;
>>> @@ -677,8 +749,6 @@ EXPORT_SYMBOL_GPL(dw_pcie_ep_init_complete);
>>>   int dw_pcie_ep_init(struct dw_pcie_ep *ep)
>>>   {
>>>      int ret;
>>> -   void *addr;
>>> -   u8 func_no;
>>>      struct resource *res;
>>>      struct pci_epc *epc;
>>>      struct dw_pcie *pci = to_dw_pcie_from_ep(ep);
>>> @@ -686,7 +756,12 @@ int dw_pcie_ep_init(struct dw_pcie_ep *ep)
>>>      struct platform_device *pdev = to_platform_device(dev);
>>>      struct device_node *np = dev->of_node;
>>>      const struct pci_epc_features *epc_features;
>>> -   struct dw_pcie_ep_func *ep_func;
>>> +
>>> +   if (ep->ops->get_features) {
>>> +           epc_features = ep->ops->get_features(ep);
>>> +           if (epc_features->core_init_notifier)
>>> +                   ep->core_init_notifier = true;
>>> +   }
>>>
>>>      INIT_LIST_HEAD(&ep->func_list);
>>>
>>> @@ -708,7 +783,11 @@ int dw_pcie_ep_init(struct dw_pcie_ep *ep)
>>>              }
>>>      }
>>>
>>> -   dw_pcie_iatu_detect(pci);
>>> +   if (!ep->core_init_notifier) {
>>> +           ret = dw_pcie_iatu_config(ep);
>>> +           if (ret)
>>> +                   return ret;
>>> +   }
>>>
>>>      res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "addr_space");
>>>      if (!res)
>>> @@ -717,26 +796,6 @@ int dw_pcie_ep_init(struct dw_pcie_ep *ep)
>>>      ep->phys_base = res->start;
>>>      ep->addr_size = resource_size(res);
>>>
>>> -   ep->ib_window_map = devm_kcalloc(dev,
>>> -                                    BITS_TO_LONGS(pci->num_ib_windows),
>>> -                                    sizeof(long),
>>> -                                    GFP_KERNEL);
>>> -   if (!ep->ib_window_map)
>>> -           return -ENOMEM;
>>> -
>>> -   ep->ob_window_map = devm_kcalloc(dev,
>>> -                                    BITS_TO_LONGS(pci->num_ob_windows),
>>> -                                    sizeof(long),
>>> -                                    GFP_KERNEL);
>>> -   if (!ep->ob_window_map)
>>> -           return -ENOMEM;
>>> -
>>> -   addr = devm_kcalloc(dev, pci->num_ob_windows, sizeof(phys_addr_t),
>>> -                       GFP_KERNEL);
>>> -   if (!addr)
>>> -           return -ENOMEM;
>>> -   ep->outbound_addr = addr;
>>> -
>>>      if (pci->link_gen < 1)
>>>              pci->link_gen = of_pci_get_max_link_speed(np);
>>>
>>> @@ -753,23 +812,15 @@ int dw_pcie_ep_init(struct dw_pcie_ep *ep)
>>>      if (ret < 0)
>>>              epc->max_functions = 1;
>>>
>>> -   for (func_no = 0; func_no < epc->max_functions; func_no++) {
>>> -           ep_func = devm_kzalloc(dev, sizeof(*ep_func), GFP_KERNEL);
>>> -           if (!ep_func)
>>> -                   return -ENOMEM;
>>> -
>>> -           ep_func->func_no = func_no;
>>> -           ep_func->msi_cap = dw_pcie_ep_find_capability(ep, func_no,
>>> -                                                         PCI_CAP_ID_MSI);
>>> -           ep_func->msix_cap = dw_pcie_ep_find_capability(ep, func_no,
>>> -                                                          PCI_CAP_ID_MSIX);
>>> +   if (!ep->core_init_notifier) {
>>> +           ret = dw_pcie_ep_func_init(ep);
>>> +           if (ret)
>>> +                   return ret;
>>>
>>> -           list_add_tail(&ep_func->list, &ep->func_list);
>>> +           if (ep->ops->ep_init)
>>> +                   ep->ops->ep_init(ep);
>>>      }
>>>
>>> -   if (ep->ops->ep_init)
>>> -           ep->ops->ep_init(ep);
>>> -
>>>      ret = pci_epc_mem_init(epc, ep->phys_base, ep->addr_size,
>>>                             ep->page_size);
>>>      if (ret < 0) {
>>> @@ -784,12 +835,9 @@ int dw_pcie_ep_init(struct dw_pcie_ep *ep)
>>>              return -ENOMEM;
>>>      }
>>>
>>> -   if (ep->ops->get_features) {
>>> -           epc_features = ep->ops->get_features(ep);
>>> -           if (epc_features->core_init_notifier)
>>> -                   return 0;
>>> -   }
>>> +   if (!ep->core_init_notifier)
>>> +           return dw_pcie_ep_init_complete(ep);
>>>
>>> -   return dw_pcie_ep_init_complete(ep);
>>> +   return 0;
>>>   }
>>>   EXPORT_SYMBOL_GPL(dw_pcie_ep_init);
>>> diff --git a/drivers/pci/controller/dwc/pcie-designware.h b/drivers/pci/controller/dwc/pcie-designware.h
>>> index 7d6e9b7576be..aadb14159df7 100644
>>> --- a/drivers/pci/controller/dwc/pcie-designware.h
>>> +++ b/drivers/pci/controller/dwc/pcie-designware.h
>>> @@ -242,6 +242,7 @@ struct dw_pcie_ep {
>>>      void __iomem            *msi_mem;
>>>      phys_addr_t             msi_mem_phys;
>>>      struct pci_epf_bar      *epf_bar[PCI_STD_NUM_BARS];
>>> +   bool                    core_init_notifier;
>>>   };
>>>
>>>   struct dw_pcie_ops {
>>> --
>>> 2.25.1
>>>
> 
> --
> மணிவண்ணன் சதாசிவம்
>