From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.4 required=3.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 01D70C2D0C3 for ; Mon, 30 Dec 2019 05:57:30 +0000 (UTC) Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (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 B5DAA206DB for ; Mon, 30 Dec 2019 05:57:29 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="pwsqqy8R" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B5DAA206DB Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=iommu-bounces@lists.linux-foundation.org Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 70CF586111; Mon, 30 Dec 2019 05:57:29 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Y61kNk6fw6Oi; Mon, 30 Dec 2019 05:57:28 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by hemlock.osuosl.org (Postfix) with ESMTP id D222986003; Mon, 30 Dec 2019 05:57:28 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id BDFF2C1796; Mon, 30 Dec 2019 05:57:28 +0000 (UTC) Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by lists.linuxfoundation.org (Postfix) with ESMTP id 7166DC077D for ; Mon, 30 Dec 2019 05:57:26 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 59610848F0 for ; Mon, 30 Dec 2019 05:57:26 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id A8VivVZ9+BE5 for ; Mon, 30 Dec 2019 05:57:25 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pl1-f195.google.com (mail-pl1-f195.google.com [209.85.214.195]) by whitealder.osuosl.org (Postfix) with ESMTPS id B3A32814C9 for ; Mon, 30 Dec 2019 05:57:25 +0000 (UTC) Received: by mail-pl1-f195.google.com with SMTP id a6so13488675plm.3 for ; Sun, 29 Dec 2019 21:57:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=dYzDa2WqHwUT+3MkcVhYul9GkntVB+kwzpl6/aw1YO8=; b=pwsqqy8RTmYUfATQQ3ynUWUNaSRuSJ7FgWqfZoJRKsLp1HwHnL9X4P8CuRAkYms9zz 5fZiHT5L97QBu6tyaMILE3XzOKWtLK+/zYN522G6i3WSLOGUJhmp/427IsCQyrHBpLc3 bFmUSegPUQDMJGoDtBozdaOYuqwL0BHWjbFy3CAOQ9z3h9EZ2Ct8IeevoQE7qz3P2tqP oLR+5FpK04SSflnyGB5AoKVpp7qqAHkSJ66pud+zrGchMUBXmfP8KFei95w0SYc9ItlO g4Wnant9Gjpdn2+KNVJourdQ4AsfmBNQkzqizUjsrMgWr6Nrxac2Kz0p5bPW0iQr3dz7 /baA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=dYzDa2WqHwUT+3MkcVhYul9GkntVB+kwzpl6/aw1YO8=; b=WcStnjYSyL/3+oUPhcoGD8EE2FX9ocnLJNrgXYvfD9MrW9AOrzYIJyvO5fVNoAzhrE k4hMrm2OcL922EP5XQqhXARA06GbI6sroiGShZLmjF2nkTcTIT538KY4Y0A8DVQVT0PL rAO7RtKXoT9kvCYnx+LU6AIuBDjGxKNeJsAIEbsYRf1vduRa+czrTcG7wguG8LmB9hnA vGOudVcEK6H47YNiwQcr0zonMFBBy1iInH0n2NeBu3zupD0bGgbkpaJR/JusPYNSXQNd Xgmyq36HQVhJknxo3r01UaERzrHErW3YvlPgRPETNbbXB/66Yx+KZA/RYyGC1U7L2YyS Kjdw== X-Gm-Message-State: APjAAAUpnsOdSfo7S5/MbGXzfoNhoOMIDcbmorAe+VUb3HwNmoIL1F+b DETIZoqmuPo8Jp9oKxxJwto= X-Google-Smtp-Source: APXvYqyf2XVz14nN4sNJiYy/n/zkoWFcA9pZ5EpIIQPzSJzcKiW7jSpixSvKvy3H+JwYCdFCjgpFUA== X-Received: by 2002:a17:902:8646:: with SMTP id y6mr66004759plt.191.1577685445244; Sun, 29 Dec 2019 21:57:25 -0800 (PST) Received: from AHUANG12-1LT7M0.lenovo.com (218-164-16-162.dynamic-ip.hinet.net. [218.164.16.162]) by smtp.googlemail.com with ESMTPSA id n1sm49531269pfd.47.2019.12.29.21.57.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Dec 2019 21:57:24 -0800 (PST) From: Adrian Huang X-Google-Original-From: Adrian Huang To: Joerg Roedel Subject: [PATCH 1/1] iommu/amd: Fix typos for PPR macros Date: Mon, 30 Dec 2019 13:56:54 +0800 Message-Id: <20191230055654.16029-1-ahuang12@lenovo.com> X-Mailer: git-send-email 2.17.1 Cc: iommu@lists.linux-foundation.org, Adrian Huang X-BeenThere: iommu@lists.linux-foundation.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Development issues for Linux IOMMU support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: iommu-bounces@lists.linux-foundation.org Sender: "iommu" From: Adrian Huang The bit 13 and bit 14 of the IOMMU control register are PPRLogEn and PPRIntEn. They are related to PPR (Peripheral Page Request) instead of 'PPF'. Fix them accrodingly. Signed-off-by: Adrian Huang --- drivers/iommu/amd_iommu_init.c | 4 ++-- drivers/iommu/amd_iommu_types.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/iommu/amd_iommu_init.c b/drivers/iommu/amd_iommu_init.c index ba7ee4aa04f9..6e82aa606e2b 100644 --- a/drivers/iommu/amd_iommu_init.c +++ b/drivers/iommu/amd_iommu_init.c @@ -716,7 +716,7 @@ static void iommu_enable_ppr_log(struct amd_iommu *iommu) writel(0x00, iommu->mmio_base + MMIO_PPR_HEAD_OFFSET); writel(0x00, iommu->mmio_base + MMIO_PPR_TAIL_OFFSET); - iommu_feature_enable(iommu, CONTROL_PPFLOG_EN); + iommu_feature_enable(iommu, CONTROL_PPRLOG_EN); iommu_feature_enable(iommu, CONTROL_PPR_EN); } @@ -2035,7 +2035,7 @@ static int iommu_init_msi(struct amd_iommu *iommu) iommu_feature_enable(iommu, CONTROL_EVT_INT_EN); if (iommu->ppr_log != NULL) - iommu_feature_enable(iommu, CONTROL_PPFINT_EN); + iommu_feature_enable(iommu, CONTROL_PPRINT_EN); iommu_ga_log_enable(iommu); diff --git a/drivers/iommu/amd_iommu_types.h b/drivers/iommu/amd_iommu_types.h index 798e1533a147..500f0b78879d 100644 --- a/drivers/iommu/amd_iommu_types.h +++ b/drivers/iommu/amd_iommu_types.h @@ -147,8 +147,8 @@ #define CONTROL_COHERENT_EN 0x0aULL #define CONTROL_ISOC_EN 0x0bULL #define CONTROL_CMDBUF_EN 0x0cULL -#define CONTROL_PPFLOG_EN 0x0dULL -#define CONTROL_PPFINT_EN 0x0eULL +#define CONTROL_PPRLOG_EN 0x0dULL +#define CONTROL_PPRINT_EN 0x0eULL #define CONTROL_PPR_EN 0x0fULL #define CONTROL_GT_EN 0x10ULL #define CONTROL_GA_EN 0x11ULL -- 2.17.1 _______________________________________________ iommu mailing list iommu@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/iommu