From patchwork Thu Dec 7 11:42:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Junxian Huang X-Patchwork-Id: 175091 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp4721311vqy; Thu, 7 Dec 2023 03:46:26 -0800 (PST) X-Google-Smtp-Source: AGHT+IF4ffyMgeXJsPNatSpIfA1XZbILDjxhaNaubhmDSlUVbynVyZzCPkNldalhwXJxkBt9MBe/ X-Received: by 2002:a05:6a20:2595:b0:18f:97c:5b89 with SMTP id k21-20020a056a20259500b0018f097c5b89mr1886752pzd.87.1701949586638; Thu, 07 Dec 2023 03:46:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701949586; cv=none; d=google.com; s=arc-20160816; b=WJodCXFh/dolbT+x63qcgLl52ceftjBb+c5W3lXscRVr05p3SLAw21bxEF1psallWL 0BQLshHRI1E1nLziZx8Q8kURrSWJQyqM3JQPmBbcugf4m4kHsGiXH//beew8ST3xfrfw 7dAzcH+DQGuFSMLM4ROkUCfMwl0ujp/Tj4vLSuIeAiy2MWNOgc0cqfr06vcIzTZCgvsn r2+f3V5dnLoK2c+XjzWKOAUO/tt+QLNhFmIsYNx4xMskKepCq6lzVdoaeq65iduXeNL5 grL0a5mVggRqKazmK9cO0QjLnWYexmMquaeCLCZSZElzs+OX6Sw545WZBH2FjEB78pHX QC0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=4h8jetIDTiMMxcaqV48eppm/9fnxYPXbIamxBD/c+Mo=; fh=KWvyQxL3Ff+3WPSMjlYu+P4255AmcMULAsFol6M1vNI=; b=IoHx1zSaQlO4pZCJ8Mhx+9UcgXbKbH19idq6KZuhclagZDGvByXOjIQjbTWXQYTyA6 hJIajWduE4MZqL9w7TrpuwGuTeKOL8/CxbHfxvcoAZPsdU+X/KmP8MjZdhmbLn/WwFoH TatymsEfoZAXDLJM9QHIGeo1lVtojliOhisuJq/1SMSNZIjwM9jGx/MvHsfEIpA9m9eY EtfiOOtpIDhbe1tRfTsrbfE1AqZtZt28w4fhxeMkVTb+OHDhLFoAXawJE8Rh2pJ+YWs+ DWnu43Ymw21XywWkVCDbxoCp7a1QmMCrcMkFKSgQvnutCgiwIyAzp0bQiF5WONHrd0jJ rVdA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=hisilicon.com Received: from agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id n8-20020a170903110800b001d1cdd8618esi1026177plh.239.2023.12.07.03.46.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Dec 2023 03:46:26 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=hisilicon.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id 346BB8090272; Thu, 7 Dec 2023 03:46:17 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232262AbjLGLqH (ORCPT + 99 others); Thu, 7 Dec 2023 06:46:07 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50668 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231439AbjLGLqE (ORCPT ); Thu, 7 Dec 2023 06:46:04 -0500 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C117DD4A; Thu, 7 Dec 2023 03:46:10 -0800 (PST) Received: from kwepemi500006.china.huawei.com (unknown [172.30.72.55]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4SmC6L1hJVzShwn; Thu, 7 Dec 2023 19:41:46 +0800 (CST) Received: from localhost.localdomain (10.67.165.2) by kwepemi500006.china.huawei.com (7.221.188.68) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35; Thu, 7 Dec 2023 19:46:08 +0800 From: Junxian Huang To: , CC: , , , Subject: [PATCH v2 for-next 1/5] RDMA/hns: Rename the interrupts Date: Thu, 7 Dec 2023 19:42:27 +0800 Message-ID: <20231207114231.2872104-2-huangjunxian6@hisilicon.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20231207114231.2872104-1-huangjunxian6@hisilicon.com> References: <20231207114231.2872104-1-huangjunxian6@hisilicon.com> MIME-Version: 1.0 X-Originating-IP: [10.67.165.2] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To kwepemi500006.china.huawei.com (7.221.188.68) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Thu, 07 Dec 2023 03:46:17 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784623489543561410 X-GMAIL-MSGID: 1784623489543561410 From: Chengchang Tang Now, different devices may have the same interrupt name, which makes it difficult for users to distinguish between these interrupts. Modify the naming style to be consistent with our network devices. Before: "hns-aeq-0" "hns-ceq-0" ... Now: "hns-0000:35:00.0-aeq-0" "hns-0000:35:00.0-ceq-0" ... Signed-off-by: Chengchang Tang Signed-off-by: Junxian Huang --- drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/infiniband/hw/hns/hns_roce_hw_v2.c b/drivers/infiniband/hw/hns/hns_roce_hw_v2.c index 5d0a7a1394fc..4258b6daaded 100644 --- a/drivers/infiniband/hw/hns/hns_roce_hw_v2.c +++ b/drivers/infiniband/hw/hns/hns_roce_hw_v2.c @@ -6473,15 +6473,16 @@ static int __hns_roce_request_irq(struct hns_roce_dev *hr_dev, int irq_num, /* irq contains: abnormal + AEQ + CEQ */ for (j = 0; j < other_num; j++) snprintf((char *)hr_dev->irq_names[j], HNS_ROCE_INT_NAME_LEN, - "hns-abn-%d", j); + "hns-%s-abn-%d", pci_name(hr_dev->pci_dev), j); for (j = other_num; j < (other_num + aeq_num); j++) snprintf((char *)hr_dev->irq_names[j], HNS_ROCE_INT_NAME_LEN, - "hns-aeq-%d", j - other_num); + "hns-%s-aeq-%d", pci_name(hr_dev->pci_dev), j - other_num); for (j = (other_num + aeq_num); j < irq_num; j++) snprintf((char *)hr_dev->irq_names[j], HNS_ROCE_INT_NAME_LEN, - "hns-ceq-%d", j - other_num - aeq_num); + "hns-%s-ceq-%d", pci_name(hr_dev->pci_dev), + j - other_num - aeq_num); for (j = 0; j < irq_num; j++) { if (j < other_num)