From patchwork Tue Feb 11 14:55:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrew Cooper X-Patchwork-Id: 11375723 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BE556139A for ; Tue, 11 Feb 2020 14:56:46 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9A8CD20675 for ; Tue, 11 Feb 2020 14:56:46 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=citrix.com header.i=@citrix.com header.b="MMZwLBPr" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9A8CD20675 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=citrix.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1j1Wws-0003va-6o; Tue, 11 Feb 2020 14:55:38 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1j1Wwr-0003vQ-2v for xen-devel@lists.xenproject.org; Tue, 11 Feb 2020 14:55:37 +0000 X-Inumbo-ID: 8e77c915-4cde-11ea-b5b7-12813bfff9fa Received: from esa3.hc3370-68.iphmx.com (unknown [216.71.145.155]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 8e77c915-4cde-11ea-b5b7-12813bfff9fa; Tue, 11 Feb 2020 14:55:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1581432936; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=5lOEChwSSUJucPQfj4x6xluW+gXhKNGScDrNhE+2n+o=; b=MMZwLBPrr1xdZs0PUq2GtWYcyWSaW2JTyCmMsN4Q5ORn8rWhK2cNvHxN 456+6Gdsd9AZPOC4aV5fgvuK0dn8T7r/gmsWy97HCLwhPTGjrYI1t/gAQ F1Af5zMMgpiWfDNmB+RBvOexJBfbcYTo+MavsdtqVPPkGoLlguGWs6z31 w=; Authentication-Results: esa3.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none; spf=None smtp.pra=andrew.cooper3@citrix.com; spf=Pass smtp.mailfrom=Andrew.Cooper3@citrix.com; spf=None smtp.helo=postmaster@mail.citrix.com Received-SPF: None (esa3.hc3370-68.iphmx.com: no sender authenticity information available from domain of andrew.cooper3@citrix.com) identity=pra; client-ip=162.221.158.21; receiver=esa3.hc3370-68.iphmx.com; envelope-from="Andrew.Cooper3@citrix.com"; x-sender="andrew.cooper3@citrix.com"; x-conformance=sidf_compatible Received-SPF: Pass (esa3.hc3370-68.iphmx.com: domain of Andrew.Cooper3@citrix.com designates 162.221.158.21 as permitted sender) identity=mailfrom; client-ip=162.221.158.21; receiver=esa3.hc3370-68.iphmx.com; envelope-from="Andrew.Cooper3@citrix.com"; x-sender="Andrew.Cooper3@citrix.com"; x-conformance=sidf_compatible; x-record-type="v=spf1"; x-record-text="v=spf1 ip4:209.167.231.154 ip4:178.63.86.133 ip4:195.66.111.40/30 ip4:85.115.9.32/28 ip4:199.102.83.4 ip4:192.28.146.160 ip4:192.28.146.107 ip4:216.52.6.88 ip4:216.52.6.188 ip4:162.221.158.21 ip4:162.221.156.83 ip4:168.245.78.127 ~all" Received-SPF: None (esa3.hc3370-68.iphmx.com: no sender authenticity information available from domain of postmaster@mail.citrix.com) identity=helo; client-ip=162.221.158.21; receiver=esa3.hc3370-68.iphmx.com; envelope-from="Andrew.Cooper3@citrix.com"; x-sender="postmaster@mail.citrix.com"; x-conformance=sidf_compatible IronPort-SDR: pWddnAwGx8wvnUgPeylGanxzQUG1pnLcWrcNxKb1BGSAvUwa1jVMqhPPiHbf8lYORK2lIVCep3 LshUqVwoJ4p3Y80rEDO68BTm+ZRXg5g4Vf0sW4sxGyudFOSrEs/jL4ZNC4IebMlAZQVhhH+3oi VjBOhVPEM4s5hqT8XBeU2rws4uIyTHt8zfzauub3bD4VRWS6NGIdFPbA4/zwa5lERo8CGoSrkW NGjRJhSti6fRqyzCa2fvuahVS2V89VFfzu3st4c8yQW+tovqw1vDJwLWXWS2atXUn7DaL59coF mak= X-SBRS: 2.7 X-MesageID: 12267470 X-Ironport-Server: esa3.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.70,428,1574139600"; d="scan'208";a="12267470" From: Andrew Cooper To: Xen-devel Date: Tue, 11 Feb 2020 14:55:26 +0000 Message-ID: <20200211145526.8371-1-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.11.0 MIME-Version: 1.0 Subject: [Xen-devel] [PATCH] AMD/IOMMU: Remove unused iommu_get_addr_{lo, hi}_from_cmd() helpers X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Andrew Cooper , Wei Liu , Jan Beulich , =?utf-8?q?Roger_Pau_Monn=C3=A9?= Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" These were introduced in 262bb227a4 in 2012, and have never had any users. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- CC: Jan Beulich CC: Wei Liu CC: Roger Pau Monné --- xen/drivers/passthrough/amd/iommu-defs.h | 5 ----- xen/drivers/passthrough/amd/iommu.h | 13 ------------- 2 files changed, 18 deletions(-) diff --git a/xen/drivers/passthrough/amd/iommu-defs.h b/xen/drivers/passthrough/amd/iommu-defs.h index 50613ca150..5eb7fc7ffb 100644 --- a/xen/drivers/passthrough/amd/iommu-defs.h +++ b/xen/drivers/passthrough/amd/iommu-defs.h @@ -485,11 +485,6 @@ struct amd_iommu_pte { #define IOMMU_CMD_DEVICE_ID_MASK 0x0000FFFF #define IOMMU_CMD_DEVICE_ID_SHIFT 0 -#define IOMMU_CMD_ADDR_LOW_MASK 0xFFFFF000 -#define IOMMU_CMD_ADDR_LOW_SHIFT 12 -#define IOMMU_CMD_ADDR_HIGH_MASK 0xFFFFFFFF -#define IOMMU_CMD_ADDR_HIGH_SHIFT 0 - #define IOMMU_REG_BASE_ADDR_LOW_MASK 0xFFFFF000 #define IOMMU_REG_BASE_ADDR_LOW_SHIFT 12 #define IOMMU_REG_BASE_ADDR_HIGH_MASK 0x000FFFFF diff --git a/xen/drivers/passthrough/amd/iommu.h b/xen/drivers/passthrough/amd/iommu.h index 1abfdc685a..2297ac8e73 100644 --- a/xen/drivers/passthrough/amd/iommu.h +++ b/xen/drivers/passthrough/amd/iommu.h @@ -391,19 +391,6 @@ static inline void iommu_set_devid_to_cmd(uint32_t *cmd, uint16_t id) IOMMU_CMD_DEVICE_ID_SHIFT, cmd); } -/* access address field from iommu cmd */ -static inline uint32_t iommu_get_addr_lo_from_cmd(uint32_t cmd) -{ - return get_field_from_reg_u32(cmd, IOMMU_CMD_ADDR_LOW_MASK, - IOMMU_CMD_ADDR_LOW_SHIFT); -} - -static inline uint32_t iommu_get_addr_hi_from_cmd(uint32_t cmd) -{ - return get_field_from_reg_u32(cmd, IOMMU_CMD_ADDR_LOW_MASK, - IOMMU_CMD_ADDR_HIGH_SHIFT); -} - /* access iommu base addresses field from mmio regs */ static inline void iommu_set_addr_lo_to_reg(uint32_t *reg, uint32_t addr) {