2023-08-08 15:39:04

by Xiongfeng Wang

[permalink] [raw]
Subject: [PATCH] hwtracing: hisi_ptt: Use pci_dev_id() to simplify the code

PCI core API pci_dev_id() can be used to get the BDF number for a pci
device. We don't need to compose it mannually using PCI_DEVID(). Use
pci_dev_id() to simplify the code a little bit.

Signed-off-by: Xiongfeng Wang <[email protected]>
---
drivers/hwtracing/ptt/hisi_ptt.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/hwtracing/ptt/hisi_ptt.c b/drivers/hwtracing/ptt/hisi_ptt.c
index ba081b6d2435..49ea1b0f7489 100644
--- a/drivers/hwtracing/ptt/hisi_ptt.c
+++ b/drivers/hwtracing/ptt/hisi_ptt.c
@@ -618,13 +618,13 @@ static int hisi_ptt_notifier_call(struct notifier_block *nb, unsigned long actio
if (!root_port)
return 0;

- port_devid = PCI_DEVID(root_port->bus->number, root_port->devfn);
+ port_devid = pci_dev_id(root_port);
if (port_devid < hisi_ptt->lower_bdf ||
port_devid > hisi_ptt->upper_bdf)
return 0;

info.is_port = pci_pcie_type(pdev) == PCI_EXP_TYPE_ROOT_PORT;
- info.devid = PCI_DEVID(pdev->bus->number, pdev->devfn);
+ info.devid = pci_dev_id(pdev);

switch (action) {
case BUS_NOTIFY_ADD_DEVICE:
@@ -664,7 +664,7 @@ static int hisi_ptt_init_filters(struct pci_dev *pdev, void *data)
if (!root_port)
return 0;

- port_devid = PCI_DEVID(root_port->bus->number, root_port->devfn);
+ port_devid = pci_dev_id(root_port);
if (port_devid < hisi_ptt->lower_bdf ||
port_devid > hisi_ptt->upper_bdf)
return 0;
@@ -674,7 +674,7 @@ static int hisi_ptt_init_filters(struct pci_dev *pdev, void *data)
* should be partial initialized and users would know which filter fails
* through the log. Other functions of PTT device are still available.
*/
- filter = hisi_ptt_alloc_add_filter(hisi_ptt, PCI_DEVID(pdev->bus->number, pdev->devfn),
+ filter = hisi_ptt_alloc_add_filter(hisi_ptt, pci_dev_id(pdev),
pci_pcie_type(pdev) == PCI_EXP_TYPE_ROOT_PORT);
if (!filter)
return -ENOMEM;
--
2.20.1



2023-08-08 17:45:48

by Yang Yingliang

[permalink] [raw]
Subject: Re: [PATCH] hwtracing: hisi_ptt: Use pci_dev_id() to simplify the code


On 2023/8/8 11:08, Xiongfeng Wang wrote:
> PCI core API pci_dev_id() can be used to get the BDF number for a pci
> device. We don't need to compose it mannually using PCI_DEVID(). Use
> pci_dev_id() to simplify the code a little bit.
>
> Signed-off-by: Xiongfeng Wang <[email protected]>
Reviewed-by: Yang Yingliang <[email protected]>

2023-08-14 14:58:47

by Yicong Yang

[permalink] [raw]
Subject: Re: [PATCH] hwtracing: hisi_ptt: Use pci_dev_id() to simplify the code

On 2023/8/8 11:08, Xiongfeng Wang wrote:
> PCI core API pci_dev_id() can be used to get the BDF number for a pci
> device. We don't need to compose it mannually using PCI_DEVID(). Use
> pci_dev_id() to simplify the code a little bit.
>
> Signed-off-by: Xiongfeng Wang <[email protected]>

Reviewed-by: Yicong Yang <[email protected]>

> ---
> drivers/hwtracing/ptt/hisi_ptt.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/hwtracing/ptt/hisi_ptt.c b/drivers/hwtracing/ptt/hisi_ptt.c
> index ba081b6d2435..49ea1b0f7489 100644
> --- a/drivers/hwtracing/ptt/hisi_ptt.c
> +++ b/drivers/hwtracing/ptt/hisi_ptt.c
> @@ -618,13 +618,13 @@ static int hisi_ptt_notifier_call(struct notifier_block *nb, unsigned long actio
> if (!root_port)
> return 0;
>
> - port_devid = PCI_DEVID(root_port->bus->number, root_port->devfn);
> + port_devid = pci_dev_id(root_port);
> if (port_devid < hisi_ptt->lower_bdf ||
> port_devid > hisi_ptt->upper_bdf)
> return 0;
>
> info.is_port = pci_pcie_type(pdev) == PCI_EXP_TYPE_ROOT_PORT;
> - info.devid = PCI_DEVID(pdev->bus->number, pdev->devfn);
> + info.devid = pci_dev_id(pdev);
>
> switch (action) {
> case BUS_NOTIFY_ADD_DEVICE:
> @@ -664,7 +664,7 @@ static int hisi_ptt_init_filters(struct pci_dev *pdev, void *data)
> if (!root_port)
> return 0;
>
> - port_devid = PCI_DEVID(root_port->bus->number, root_port->devfn);
> + port_devid = pci_dev_id(root_port);
> if (port_devid < hisi_ptt->lower_bdf ||
> port_devid > hisi_ptt->upper_bdf)
> return 0;
> @@ -674,7 +674,7 @@ static int hisi_ptt_init_filters(struct pci_dev *pdev, void *data)
> * should be partial initialized and users would know which filter fails
> * through the log. Other functions of PTT device are still available.
> */
> - filter = hisi_ptt_alloc_add_filter(hisi_ptt, PCI_DEVID(pdev->bus->number, pdev->devfn),
> + filter = hisi_ptt_alloc_add_filter(hisi_ptt, pci_dev_id(pdev),
> pci_pcie_type(pdev) == PCI_EXP_TYPE_ROOT_PORT);
> if (!filter)
> return -ENOMEM;
>

2023-08-16 09:58:10

by Suzuki K Poulose

[permalink] [raw]
Subject: Re: [PATCH] hwtracing: hisi_ptt: Use pci_dev_id() to simplify the code

On 14/08/2023 15:28, Yicong Yang wrote:
> On 2023/8/8 11:08, Xiongfeng Wang wrote:
>> PCI core API pci_dev_id() can be used to get the BDF number for a pci
>> device. We don't need to compose it mannually using PCI_DEVID(). Use
>> pci_dev_id() to simplify the code a little bit.
>>
>> Signed-off-by: Xiongfeng Wang <[email protected]>
>
> Reviewed-by: Yicong Yang <[email protected]>

Thanks Yicong Yang, for looping me in.

In the future, please Cc me for any patches may need to be picked
up via coresight tree. For now:


Applied, thanks!

[1/1] hwtracing: hisi_ptt: Use pci_dev_id() to simplify the code
https://git.kernel.org/coresight/c/484281bd5b98

Best regards,
--
Suzuki K Poulose <[email protected]>


>
>> ---
>> drivers/hwtracing/ptt/hisi_ptt.c | 8 ++++----
>> 1 file changed, 4 insertions(+), 4 deletions(-)
>>
>> diff --git a/drivers/hwtracing/ptt/hisi_ptt.c b/drivers/hwtracing/ptt/hisi_ptt.c
>> index ba081b6d2435..49ea1b0f7489 100644
>> --- a/drivers/hwtracing/ptt/hisi_ptt.c
>> +++ b/drivers/hwtracing/ptt/hisi_ptt.c
>> @@ -618,13 +618,13 @@ static int hisi_ptt_notifier_call(struct notifier_block *nb, unsigned long actio
>> if (!root_port)
>> return 0;
>>
>> - port_devid = PCI_DEVID(root_port->bus->number, root_port->devfn);
>> + port_devid = pci_dev_id(root_port);
>> if (port_devid < hisi_ptt->lower_bdf ||
>> port_devid > hisi_ptt->upper_bdf)
>> return 0;
>>
>> info.is_port = pci_pcie_type(pdev) == PCI_EXP_TYPE_ROOT_PORT;
>> - info.devid = PCI_DEVID(pdev->bus->number, pdev->devfn);
>> + info.devid = pci_dev_id(pdev);
>>
>> switch (action) {
>> case BUS_NOTIFY_ADD_DEVICE:
>> @@ -664,7 +664,7 @@ static int hisi_ptt_init_filters(struct pci_dev *pdev, void *data)
>> if (!root_port)
>> return 0;
>>
>> - port_devid = PCI_DEVID(root_port->bus->number, root_port->devfn);
>> + port_devid = pci_dev_id(root_port);
>> if (port_devid < hisi_ptt->lower_bdf ||
>> port_devid > hisi_ptt->upper_bdf)
>> return 0;
>> @@ -674,7 +674,7 @@ static int hisi_ptt_init_filters(struct pci_dev *pdev, void *data)
>> * should be partial initialized and users would know which filter fails
>> * through the log. Other functions of PTT device are still available.
>> */
>> - filter = hisi_ptt_alloc_add_filter(hisi_ptt, PCI_DEVID(pdev->bus->number, pdev->devfn),
>> + filter = hisi_ptt_alloc_add_filter(hisi_ptt, pci_dev_id(pdev),
>> pci_pcie_type(pdev) == PCI_EXP_TYPE_ROOT_PORT);
>> if (!filter)
>> return -ENOMEM;
>>