Received: by 2002:a05:7412:419a:b0:f3:1519:9f41 with SMTP id i26csp4452852rdh; Wed, 29 Nov 2023 01:48:35 -0800 (PST) X-Google-Smtp-Source: AGHT+IGpyaPINeGQo0YDfeywcCfrk9EGMltRsZ0t1zs+2HDUDc6CXh6ETS4Tt/8jxLm/hlLZfnEB X-Received: by 2002:a05:6358:2919:b0:16d:bb7b:c0a7 with SMTP id y25-20020a056358291900b0016dbb7bc0a7mr18273139rwb.10.1701251314777; Wed, 29 Nov 2023 01:48:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701251314; cv=none; d=google.com; s=arc-20160816; b=qsP10CdR7e9KN2EvHdO4k+xBpoPj0ljpH4QUAi0RmwtExTlkNjObhJxrb6Uw1nrtGB +sVTt2zYu6CbD739i8jZHrqdOQEA6X6zpuccncl88as2mBY1NadYXqyQ7RgVoXHe05Ti vPxJijoUlrGprmp4IWYE2myC6y5WGcYjc1Nf8VyKse0Ae1dLivpWugTpjsFk1n7kSaCH Q7DUmX15oMTZmtNUKtaP1kJ4KMJH+BElmZw4Z/G+SjOu2JW45ySMoQcA9yyWll1iJoWT 1h2DZSzya+pax7HcCQKPoIAfKVAi2LuJWNB9ViWXyyC+nnDM6k3gJO1vv9jEZHCQlDaO 6m3Q== 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=DslqwWasc5dXLuSNcQ+0fxNTn4+nOS5dpXOGlVDc8WI=; fh=KWvyQxL3Ff+3WPSMjlYu+P4255AmcMULAsFol6M1vNI=; b=yIIMNvRc8tlamUwUjq2AnFt5bM+Id0wf9BdNfr1NatbkNV/Q6AQrDE49Wp3c598yky nzUjQv8cLcHepqm4tcO+FPbB0FlOfq0uBkrRyliroNpoarGbwkaa+v9tGzzHeXO9sFQl wldA3idpGVjmjDgs//5qFQpq/merIz1ErO6ytzkS6p22qxiUsVJJiJSgW02RwESgMukk gsm+0dGi5f9ABzm6iP+lcYkymK0QNf2z3W8nl166J15DHPYdgrwqFKREcQPRwroPmOzh FtDFMmsrX2NaI3KTXbvLHrOuMuJ9JIRNh1+FY3hHKnzabiyqfJe+LK+htWyN8GFam2dA YGHQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=hisilicon.com Return-Path: Received: from howler.vger.email (howler.vger.email. [23.128.96.34]) by mx.google.com with ESMTPS id cl6-20020a056a02098600b005b9b68add8bsi15390329pgb.785.2023.11.29.01.48.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Nov 2023 01:48:34 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) client-ip=23.128.96.34; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 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 howler.vger.email (Postfix) with ESMTP id 5E9B980AD083; Wed, 29 Nov 2023 01:48:29 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229586AbjK2JsK (ORCPT + 99 others); Wed, 29 Nov 2023 04:48:10 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40300 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229485AbjK2JsE (ORCPT ); Wed, 29 Nov 2023 04:48:04 -0500 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E810D1999; Wed, 29 Nov 2023 01:48:09 -0800 (PST) Received: from kwepemi500006.china.huawei.com (unknown [172.30.72.56]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4SgDtj25spzsRSW; Wed, 29 Nov 2023 17:44:29 +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; Wed, 29 Nov 2023 17:48:07 +0800 From: Junxian Huang To: , CC: , , , Subject: [PATCH for-rc 1/6] RDMA/hns: Rename the interrupts Date: Wed, 29 Nov 2023 17:44:29 +0800 Message-ID: <20231129094434.134528-2-huangjunxian6@hisilicon.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20231129094434.134528-1-huangjunxian6@hisilicon.com> References: <20231129094434.134528-1-huangjunxian6@hisilicon.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-Originating-IP: [10.67.165.2] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) 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 howler.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 (howler.vger.email [0.0.0.0]); Wed, 29 Nov 2023 01:48:29 -0800 (PST) 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 2bca9560f32d..1ceeedfa225f 100644 --- a/drivers/infiniband/hw/hns/hns_roce_hw_v2.c +++ b/drivers/infiniband/hw/hns/hns_roce_hw_v2.c @@ -6457,15 +6457,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) -- 2.30.0