From: Mika Westerberg Date: Mon, 1 Jun 2020 09:42:05 +0000 (+0300) Subject: thunderbolt: No need to warn if NHI hop_count != 12 or hop_count != 32 X-Git-Tag: v5.9-rc1~142^2~65^2~29 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=177aa362eb92ab8bd350a0642b66252db24b6140;p=thirdparty%2Flinux.git thunderbolt: No need to warn if NHI hop_count != 12 or hop_count != 32 While Intel hardware typically has hop_count (Total Paths in the spec) 12 the USB4 spec allows this to be anything between 1 and 21 so no need to warn about this. Simply log number of paths at debug level. Signed-off-by: Mika Westerberg --- diff --git a/drivers/thunderbolt/nhi.c b/drivers/thunderbolt/nhi.c index d299dc1681471..b617922b5b0a8 100644 --- a/drivers/thunderbolt/nhi.c +++ b/drivers/thunderbolt/nhi.c @@ -1123,9 +1123,7 @@ static int nhi_probe(struct pci_dev *pdev, const struct pci_device_id *id) /* cannot fail - table is allocated bin pcim_iomap_regions */ nhi->iobase = pcim_iomap_table(pdev)[0]; nhi->hop_count = ioread32(nhi->iobase + REG_HOP_COUNT) & 0x3ff; - if (nhi->hop_count != 12 && nhi->hop_count != 32) - dev_warn(&pdev->dev, "unexpected hop count: %d\n", - nhi->hop_count); + dev_dbg(&pdev->dev, "total paths: %d\n", nhi->hop_count); nhi->tx_rings = devm_kcalloc(&pdev->dev, nhi->hop_count, sizeof(*nhi->tx_rings), GFP_KERNEL);