Received: by 2002:a05:6a10:22f:0:0:0:0 with SMTP id 15csp1132745pxk; Fri, 4 Sep 2020 01:07:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyuopo7wsj7sD2Sjum90kJtUYp0UMr7hAQjxNZQp+4ovX3VkrelmhWqM2jUkKMHV1aMtCfZ X-Received: by 2002:a17:906:474f:: with SMTP id j15mr6625117ejs.468.1599206850282; Fri, 04 Sep 2020 01:07:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1599206850; cv=none; d=google.com; s=arc-20160816; b=L2XYEV3ecnGCylTZNIEDN6BQnHDlgFCmaK6JpiS84afCedd9fuA/C4XLkp7jc1yEHO 3oNM/19HdlxmJ51dtJD3BiFmbZkRatxvLugUT391s07kzUmXIiEUNYNbCJhltA1rgr/b SR3h3Rx3DQEPFa8CtVZp/FuBWsq10yW24eLGOSf/irV4IzxxEg/qBlsALdbYG7k3WcB7 Usf7OYW0YdlGVglvmQLP7jeQoxS26zYUXe6EbmrQSii+D+NZHtp9TPvtpfxU0PqlbHTf A7vk9mThx6Ms8EMNnphgVq1TXuKyUY8ixJEEDHNaXNqK7JTtpI4ee2FggCGkmHwbuZ0A oOWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:ironport-sdr:ironport-sdr; bh=Whwca4HL+EdVZn1+0XADb9Ku/GxXYvIan71IYR0aN+Y=; b=gdd52KVgeL9RARZsKlnX12kS2y+ul/rxEM5k9jDkc/HLr9+TXthY4V+Z/DcZU3loop 6IxZahxD69cJP87DkH00QdP3+uYsjII1yYfnAgfWETBJbEzb0ds4MnO2j/Qdl/SqZ3fe eteSPaRGYHOEMwevNXgLEkIu9KBcuNEKXsU6qoWFe3BsxH+9B3+pBAGAhSoxut5VlJ8Q lisXGwxx7mhmn/lkN5Icz0rfeaoxDL1M5SDBYw/ZFUqGpqn2TO0ngG5o4WUa293wkY+U s3vvY3NlTY3gCpeG7wI6eSNKrk3asuLiCGNul4zbNnj9QfuREpMjsWgjwVOqf5h+WH4b xBSg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-crypto-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-crypto-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id s11si4559994edi.214.2020.09.04.01.06.57; Fri, 04 Sep 2020 01:07:30 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-crypto-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-crypto-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-crypto-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728205AbgIDIEt (ORCPT + 99 others); Fri, 4 Sep 2020 04:04:49 -0400 Received: from mga17.intel.com ([192.55.52.151]:3276 "EHLO mga17.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729654AbgIDIEs (ORCPT ); Fri, 4 Sep 2020 04:04:48 -0400 IronPort-SDR: qjsD7+bT7otUC5DhXGLlDB00KKfUDPwAc1gztvSjVcv/SR6q/dNl1/y2xy14c1z2xjd0SD9iJR GvLq6BU987Ag== X-IronPort-AV: E=McAfee;i="6000,8403,9733"; a="137760245" X-IronPort-AV: E=Sophos;i="5.76,388,1592895600"; d="scan'208";a="137760245" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Sep 2020 01:04:48 -0700 IronPort-SDR: ALDgnHf4XTALoU5LO+qpl/DzNF9AY/8n+uj+okEmSixMKDY3fBcUW43P6Me7qif+y6xwVFzmLf HfUpPPtNVW/g== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,388,1592895600"; d="scan'208";a="298334812" Received: from silpixa00400314.ir.intel.com (HELO silpixa00400314.ger.corp.intel.com) ([10.237.222.51]) by orsmga003.jf.intel.com with ESMTP; 04 Sep 2020 01:04:44 -0700 From: Giovanni Cabiddu To: herbert@gondor.apana.org.au Cc: linux-crypto@vger.kernel.org, qat-linux@intel.com, Giovanni Cabiddu , Andy Shevchenko Subject: [PATCH] crypto: qat - include domain in top level debugfs path Date: Fri, 4 Sep 2020 09:04:15 +0100 Message-Id: <20200904080415.75039-1-giovanni.cabiddu@intel.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org Use pci_name() when creating debugfs entries in order to include PCI domain in the path. Signed-off-by: Giovanni Cabiddu Reviewed-by: Andy Shevchenko --- drivers/crypto/qat/qat_c3xxx/adf_drv.c | 6 ++---- drivers/crypto/qat/qat_c3xxxvf/adf_drv.c | 6 ++---- drivers/crypto/qat/qat_c62x/adf_drv.c | 6 ++---- drivers/crypto/qat/qat_c62xvf/adf_drv.c | 6 ++---- drivers/crypto/qat/qat_dh895xcc/adf_drv.c | 6 ++---- drivers/crypto/qat/qat_dh895xccvf/adf_drv.c | 6 ++---- 6 files changed, 12 insertions(+), 24 deletions(-) diff --git a/drivers/crypto/qat/qat_c3xxx/adf_drv.c b/drivers/crypto/qat/qat_c3xxx/adf_drv.c index 020d099409e5..8a85484dca5b 100644 --- a/drivers/crypto/qat/qat_c3xxx/adf_drv.c +++ b/drivers/crypto/qat/qat_c3xxx/adf_drv.c @@ -143,10 +143,8 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent) } /* Create dev top level debugfs entry */ - snprintf(name, sizeof(name), "%s%s_%02x:%02d.%d", - ADF_DEVICE_NAME_PREFIX, hw_data->dev_class->name, - pdev->bus->number, PCI_SLOT(pdev->devfn), - PCI_FUNC(pdev->devfn)); + snprintf(name, sizeof(name), "%s%s_%s", ADF_DEVICE_NAME_PREFIX, + hw_data->dev_class->name, pci_name(pdev)); accel_dev->debugfs_dir = debugfs_create_dir(name, NULL); diff --git a/drivers/crypto/qat/qat_c3xxxvf/adf_drv.c b/drivers/crypto/qat/qat_c3xxxvf/adf_drv.c index 11039fe55f61..71cf58f96292 100644 --- a/drivers/crypto/qat/qat_c3xxxvf/adf_drv.c +++ b/drivers/crypto/qat/qat_c3xxxvf/adf_drv.c @@ -127,10 +127,8 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent) accel_pci_dev->sku = hw_data->get_sku(hw_data); /* Create dev top level debugfs entry */ - snprintf(name, sizeof(name), "%s%s_%02x:%02d.%d", - ADF_DEVICE_NAME_PREFIX, hw_data->dev_class->name, - pdev->bus->number, PCI_SLOT(pdev->devfn), - PCI_FUNC(pdev->devfn)); + snprintf(name, sizeof(name), "%s%s_%s", ADF_DEVICE_NAME_PREFIX, + hw_data->dev_class->name, pci_name(pdev)); accel_dev->debugfs_dir = debugfs_create_dir(name, NULL); diff --git a/drivers/crypto/qat/qat_c62x/adf_drv.c b/drivers/crypto/qat/qat_c62x/adf_drv.c index 4ba9c14383af..e8afbf5f7dd2 100644 --- a/drivers/crypto/qat/qat_c62x/adf_drv.c +++ b/drivers/crypto/qat/qat_c62x/adf_drv.c @@ -143,10 +143,8 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent) } /* Create dev top level debugfs entry */ - snprintf(name, sizeof(name), "%s%s_%02x:%02d.%d", - ADF_DEVICE_NAME_PREFIX, hw_data->dev_class->name, - pdev->bus->number, PCI_SLOT(pdev->devfn), - PCI_FUNC(pdev->devfn)); + snprintf(name, sizeof(name), "%s%s_%s", ADF_DEVICE_NAME_PREFIX, + hw_data->dev_class->name, pci_name(pdev)); accel_dev->debugfs_dir = debugfs_create_dir(name, NULL); diff --git a/drivers/crypto/qat/qat_c62xvf/adf_drv.c b/drivers/crypto/qat/qat_c62xvf/adf_drv.c index b8b021d54bb5..7e6536246238 100644 --- a/drivers/crypto/qat/qat_c62xvf/adf_drv.c +++ b/drivers/crypto/qat/qat_c62xvf/adf_drv.c @@ -127,10 +127,8 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent) accel_pci_dev->sku = hw_data->get_sku(hw_data); /* Create dev top level debugfs entry */ - snprintf(name, sizeof(name), "%s%s_%02x:%02d.%d", - ADF_DEVICE_NAME_PREFIX, hw_data->dev_class->name, - pdev->bus->number, PCI_SLOT(pdev->devfn), - PCI_FUNC(pdev->devfn)); + snprintf(name, sizeof(name), "%s%s_%s", ADF_DEVICE_NAME_PREFIX, + hw_data->dev_class->name, pci_name(pdev)); accel_dev->debugfs_dir = debugfs_create_dir(name, NULL); diff --git a/drivers/crypto/qat/qat_dh895xcc/adf_drv.c b/drivers/crypto/qat/qat_dh895xcc/adf_drv.c index 4e877b75822b..bce10f1722ef 100644 --- a/drivers/crypto/qat/qat_dh895xcc/adf_drv.c +++ b/drivers/crypto/qat/qat_dh895xcc/adf_drv.c @@ -143,10 +143,8 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent) } /* Create dev top level debugfs entry */ - snprintf(name, sizeof(name), "%s%s_%02x:%02d.%d", - ADF_DEVICE_NAME_PREFIX, hw_data->dev_class->name, - pdev->bus->number, PCI_SLOT(pdev->devfn), - PCI_FUNC(pdev->devfn)); + snprintf(name, sizeof(name), "%s%s_%s", ADF_DEVICE_NAME_PREFIX, + hw_data->dev_class->name, pci_name(pdev)); accel_dev->debugfs_dir = debugfs_create_dir(name, NULL); diff --git a/drivers/crypto/qat/qat_dh895xccvf/adf_drv.c b/drivers/crypto/qat/qat_dh895xccvf/adf_drv.c index 7d6e1db272c2..83cd51f2a852 100644 --- a/drivers/crypto/qat/qat_dh895xccvf/adf_drv.c +++ b/drivers/crypto/qat/qat_dh895xccvf/adf_drv.c @@ -127,10 +127,8 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent) accel_pci_dev->sku = hw_data->get_sku(hw_data); /* Create dev top level debugfs entry */ - snprintf(name, sizeof(name), "%s%s_%02x:%02d.%d", - ADF_DEVICE_NAME_PREFIX, hw_data->dev_class->name, - pdev->bus->number, PCI_SLOT(pdev->devfn), - PCI_FUNC(pdev->devfn)); + snprintf(name, sizeof(name), "%s%s_%s", ADF_DEVICE_NAME_PREFIX, + hw_data->dev_class->name, pci_name(pdev)); accel_dev->debugfs_dir = debugfs_create_dir(name, NULL); -- 2.26.2