Received: by 2002:a05:6602:18e:0:0:0:0 with SMTP id m14csp9297425ioo; Sun, 5 Jun 2022 10:17:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyNS3NDOlYgWom8h8N0z+UzhDi0rLRiYf7CZWMqhuKW+5VQZfWhTaNftTv5me6roejT+L6h X-Received: by 2002:a17:906:fcd1:b0:70a:a374:905c with SMTP id qx17-20020a170906fcd100b0070aa374905cmr17345934ejb.583.1654449453563; Sun, 05 Jun 2022 10:17:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654449453; cv=none; d=google.com; s=arc-20160816; b=NkW7pTli2S3Rbg8cKglUpcYueJ5D0CP+i5yvPt6RO/xOLXcmXbZ9F2COHjed6yDxbX pZL+7Ru3oSLqOyjEqbRS24F/glA1GRyw2KrtjW1Bpte0B9e0dIB0wmbax2UpiKRg9dVT Cbl0hnwXHqTE0DelgypsdO5r7Z3FdHp/aVAoIBGhXFybdIkaVDLrWT8T/GPRQcM1loM/ XOt508+gvwI0DdfnEw3FKVT089uf1Q6tiBQDljWx4YLcHkM6wXAj4TSxWOFJeZTRhFQ4 CnDPoKkZSX93kOK0RqHh47Z7sCN9IY2oSVYHx95HIgGiuQqBveZ3X/HSWZ+U3pYkuH4a /zBQ== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=MgvmRNusvDyFF1SbzMP1HcO22MvGTJrGt5k2vXCifGA=; b=HFBypCKq7F7swKcwFAKPyAlwi7A6YbPIe/LujD/Naa6y3UOh42G8ZElxRW86LNs6Li iHlX9Lqzvl+EJD59TmruETP+fInI+rkJudVEafZ9DCLol9XhKi32lRbDZDX2uOf0N506 O5/Es2D/i5FmKrbp0h07m31ENC5ED/98rywJ6EOrGgiUXEV0FXMLmJQ3NJYK9pa2hpoa reVxzvCtENEsjJX3EXDci6sC1zi8LzqNGJD/dAIddgcgyuVK2qfhpNIMoZ2Ym6xhQ690 hY3WTCh0eJMIyInUh6xRR6X8q9h4j5OVA5g1/w6cUJiXppb2jNRQS73MLKtx/9CfaRhk A9GA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=knDbfsOL; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id sh15-20020a1709076e8f00b006feb8cc7e2asi5917432ejc.503.2022.06.05.10.17.08; Sun, 05 Jun 2022 10:17:33 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=knDbfsOL; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345166AbiFCRpx (ORCPT + 99 others); Fri, 3 Jun 2022 13:45:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56714 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345157AbiFCRox (ORCPT ); Fri, 3 Jun 2022 13:44:53 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7B1E6541A0; Fri, 3 Jun 2022 10:42:46 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 15209B823B2; Fri, 3 Jun 2022 17:42:45 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 790C1C385A9; Fri, 3 Jun 2022 17:42:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1654278163; bh=2goF6wvu7jWNv1rrIlegSjNUxSQ+fEHnI55FfXfOndo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=knDbfsOLXAq5guGo0AZZ+d/sFRkt84VRSKymwv/tqD2berZdZLLKZ/fuc1GdgK1r0 VG0ZcilOs2oq3A3ygMb4ozA3iEJbvK4VnZkVHYPx7cKnHn24TlezSBlhxiMsZHLpPF /Z1DXTTMN1wr5GkstqZ1J2Fz6krdQplA3oRqHO4Q= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Mika Westerberg , "From: Andy Shevchenko" , Wolfram Sang , Sasha Levin Subject: [PATCH 4.19 09/30] i2c: ismt: Provide a DMA buffer for Interrupt Cause Logging Date: Fri, 3 Jun 2022 19:39:37 +0200 Message-Id: <20220603173815.368098182@linuxfoundation.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220603173815.088143764@linuxfoundation.org> References: <20220603173815.088143764@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Mika Westerberg [ Upstream commit 17a0f3acdc6ec8b89ad40f6e22165a4beee25663 ] Before sending a MSI the hardware writes information pertinent to the interrupt cause to a memory location pointed by SMTICL register. This memory holds three double words where the least significant bit tells whether the interrupt cause of master/target/error is valid. The driver does not use this but we need to set it up because otherwise it will perform DMA write to the default address (0) and this will cause an IOMMU fault such as below: DMAR: DRHD: handling fault status reg 2 DMAR: [DMA Write] Request device [00:12.0] PASID ffffffff fault addr 0 [fault reason 05] PTE Write access is not set To prevent this from happening, provide a proper DMA buffer for this that then gets mapped by the IOMMU accordingly. Signed-off-by: Mika Westerberg Reviewed-by: From: Andy Shevchenko Signed-off-by: Wolfram Sang Signed-off-by: Sasha Levin --- drivers/i2c/busses/i2c-ismt.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/drivers/i2c/busses/i2c-ismt.c b/drivers/i2c/busses/i2c-ismt.c index 0d1c3ec8cb40..80796061102f 100644 --- a/drivers/i2c/busses/i2c-ismt.c +++ b/drivers/i2c/busses/i2c-ismt.c @@ -80,6 +80,7 @@ #define ISMT_DESC_ENTRIES 2 /* number of descriptor entries */ #define ISMT_MAX_RETRIES 3 /* number of SMBus retries to attempt */ +#define ISMT_LOG_ENTRIES 3 /* number of interrupt cause log entries */ /* Hardware Descriptor Constants - Control Field */ #define ISMT_DESC_CWRL 0x01 /* Command/Write Length */ @@ -173,6 +174,8 @@ struct ismt_priv { u8 head; /* ring buffer head pointer */ struct completion cmp; /* interrupt completion */ u8 buffer[I2C_SMBUS_BLOCK_MAX + 16]; /* temp R/W data buffer */ + dma_addr_t log_dma; + u32 *log; }; /** @@ -406,6 +409,9 @@ static int ismt_access(struct i2c_adapter *adap, u16 addr, memset(desc, 0, sizeof(struct ismt_desc)); desc->tgtaddr_rw = ISMT_DESC_ADDR_RW(addr, read_write); + /* Always clear the log entries */ + memset(priv->log, 0, ISMT_LOG_ENTRIES * sizeof(u32)); + /* Initialize common control bits */ if (likely(pci_dev_msi_enabled(priv->pci_dev))) desc->control = ISMT_DESC_INT | ISMT_DESC_FAIR; @@ -695,6 +701,8 @@ static void ismt_hw_init(struct ismt_priv *priv) /* initialize the Master Descriptor Base Address (MDBA) */ writeq(priv->io_rng_dma, priv->smba + ISMT_MSTR_MDBA); + writeq(priv->log_dma, priv->smba + ISMT_GR_SMTICL); + /* initialize the Master Control Register (MCTRL) */ writel(ISMT_MCTRL_MEIE, priv->smba + ISMT_MSTR_MCTRL); @@ -784,6 +792,12 @@ static int ismt_dev_init(struct ismt_priv *priv) priv->head = 0; init_completion(&priv->cmp); + priv->log = dmam_alloc_coherent(&priv->pci_dev->dev, + ISMT_LOG_ENTRIES * sizeof(u32), + &priv->log_dma, GFP_KERNEL); + if (!priv->log) + return -ENOMEM; + return 0; } -- 2.35.1