From patchwork Sat Oct 28 03:47:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cengiz Can X-Patchwork-Id: 1856466 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=185.125.189.65; helo=lists.ubuntu.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=patchwork.ozlabs.org) Received: from lists.ubuntu.com (lists.ubuntu.com [185.125.189.65]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SHQWf2pRDz1yQ5 for ; Sat, 28 Oct 2023 14:49:18 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=lists.ubuntu.com) by lists.ubuntu.com with esmtp (Exim 4.86_2) (envelope-from ) id 1qwaJu-0006zI-Ms; Sat, 28 Oct 2023 03:49:07 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by lists.ubuntu.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1qwaJE-0006nv-QU for kernel-team@lists.ubuntu.com; Sat, 28 Oct 2023 03:48:26 +0000 Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 6992E3F68B for ; Sat, 28 Oct 2023 03:48:24 +0000 (UTC) Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-408597a1ae3so20477965e9.0 for ; Fri, 27 Oct 2023 20:48:24 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698464903; x=1699069703; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=rFKs4Ku03ZDvhZkaa/QOBNkVPP6T3FbgG8qtDN0ZZjc=; b=dxntSZE9A0YOf0FRRp3AkKNQvh/MbQq/c63/W1oIw9Aw8UqHQFgvor5tr2XgGz2g+O VoEGwwSa5vWk9nAsQpKo+Ua2Leg8wHeJg4EnyzdyDTUDHsRgCOsjbAJ6zlBhVaMPLnlp c52wFzaEz86RU48hF4/CD7dHvtqv3lNjBsqE3CFMOsYElgchL1kluOwKrgQkJxdirQ7j GmiX2x+AZO4b/C5DHv+ry4IDy6OGH80iPwR0V0JTCN4Vaa6HTnBo0HiZ/xs2ZLGqMOoi C6oKejAP4K/fg1/4xky4fsu3IGfyRuxQXMdaWoYdCrWchFRN7ftlltlBojsAs6+KZaEx IA1w== X-Gm-Message-State: AOJu0YxsC5YChpbDUZZXKl09jIDUoUdDFFohCobI5g6rQhQTkYsPfsKX kkIJv/z4UGYQPnXx9wyt8ABc7tnlQPBS3X+kiEIearmk1cCpiWvvWCQLxGwPg1WDhaTjmRxh8gd KtlNraexN64IYk5VakGe/7xiNZoGBFXC4VXPVoYCNpRFZZQL8CRb59Fg= X-Received: by 2002:a05:600c:46cb:b0:408:54be:d961 with SMTP id q11-20020a05600c46cb00b0040854bed961mr3884202wmo.35.1698464903351; Fri, 27 Oct 2023 20:48:23 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEiuXkQO7F4TKmEDaWwJLK1ck87LCPGlRwspcYoF0W1L5MWiMHa9ExGMXIElltiKFfwvmIHpw== X-Received: by 2002:a05:600c:46cb:b0:408:54be:d961 with SMTP id q11-20020a05600c46cb00b0040854bed961mr3884200wmo.35.1698464903129; Fri, 27 Oct 2023 20:48:23 -0700 (PDT) Received: from localhost (uk.sesame.canonical.com. [185.125.190.60]) by smtp.gmail.com with ESMTPSA id z6-20020a05600c220600b00407b93d8085sm6334476wml.27.2023.10.27.20.48.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Oct 2023 20:48:22 -0700 (PDT) From: Cengiz Can To: kernel-team@lists.ubuntu.com Subject: [SRU Jammy 4/9] RDMA/irdma: Remove irdma_get_hw_addr() Date: Sat, 28 Oct 2023 06:47:49 +0300 Message-Id: <20231028034754.887090-5-cengiz.can@canonical.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231028034754.887090-1-cengiz.can@canonical.com> References: <20231028034754.887090-1-cengiz.can@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Zhu Yanjun The function irdma_get_hw_addr() is not used. So remove it. Link: https://lore.kernel.org/r/20211011110128.4057-4-yanjun.zhu@linux.dev Signed-off-by: Zhu Yanjun Acked-by: Shiraz Saleem Signed-off-by: Jason Gunthorpe (cherry picked from commit 16ddcfca567114ff8618ceb0bba001d8b15129e7) CVE-2023-25775 [cengizcan: prerequisite commit] Signed-off-by: Cengiz Can --- drivers/infiniband/hw/irdma/osdep.h | 1 - drivers/infiniband/hw/irdma/utils.c | 11 ----------- 2 files changed, 12 deletions(-) diff --git a/drivers/infiniband/hw/irdma/osdep.h b/drivers/infiniband/hw/irdma/osdep.h index b2ab52335ca6..63d8bb3a6903 100644 --- a/drivers/infiniband/hw/irdma/osdep.h +++ b/drivers/infiniband/hw/irdma/osdep.h @@ -37,7 +37,6 @@ struct irdma_hw; struct irdma_pci_f; struct ib_device *to_ibdev(struct irdma_sc_dev *dev); -u8 __iomem *irdma_get_hw_addr(void *dev); void irdma_ieq_mpa_crc_ae(struct irdma_sc_dev *dev, struct irdma_sc_qp *qp); enum irdma_status_code irdma_vf_wait_vchnl_resp(struct irdma_sc_dev *dev); bool irdma_vf_clear_to_send(struct irdma_sc_dev *dev); diff --git a/drivers/infiniband/hw/irdma/utils.c b/drivers/infiniband/hw/irdma/utils.c index 0817923a241d..d8399dd727cb 100644 --- a/drivers/infiniband/hw/irdma/utils.c +++ b/drivers/infiniband/hw/irdma/utils.c @@ -776,17 +776,6 @@ struct ib_qp *irdma_get_qp(struct ib_device *device, int qpn) return &iwdev->rf->qp_table[qpn]->ibqp; } -/** - * irdma_get_hw_addr - return hw addr - * @par: points to shared dev - */ -u8 __iomem *irdma_get_hw_addr(void *par) -{ - struct irdma_sc_dev *dev = par; - - return dev->hw->hw_addr; -} - /** * irdma_remove_cqp_head - return head entry and remove * @dev: device