Received: by 2002:a05:6358:489b:b0:bb:da1:e618 with SMTP id x27csp193918rwn; Wed, 14 Sep 2022 18:50:28 -0700 (PDT) X-Google-Smtp-Source: AA6agR44Je58RswFIM/RtJhyghRQw1fJnVsaedu8rSPfrDjFmcGeYGUbMuQJReDX0gvpo1GSpotJ X-Received: by 2002:a62:4c2:0:b0:52e:bd4d:50e1 with SMTP id 185-20020a6204c2000000b0052ebd4d50e1mr41130629pfe.8.1663206627676; Wed, 14 Sep 2022 18:50:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663206627; cv=none; d=google.com; s=arc-20160816; b=ueGFe0pDhrbQrj5zCbsuhlGl7j0qXisSkcFg852vWZCVZxnVTCvIMipSwia2wsQBat vKxy4Ej3u0L7yqTCZGm7y8MC363434OLqJM0YcWbDkXUOVr7X1CcLj7RUCJyyvyE4A4o xnXhRVVWKcEckVztabNwbmWno7anVwmHlHgkEW0fd8CboxsO1vJy1mu3zuOB7J1xpIWC GcXe2Awmsg72ckrCJcBH/ZTdFZjH/lE3Ajz3YJcyGL013VIBnG4Yq9ytl9zctZA8wZbU RAvAtgRBn7W+nSx1FxMk/cPR08xQTA4oyauY9Jqb40qh3VGn/qy2VCRzcOvq57Rtw1K/ nyNg== 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=2kNIMnT3T26AIgbdXZDsEeNHCMilVZyQMMWF1YCuab0=; b=tEM39B81S4yIgTv+/5Lru8QUgo9VxfrykApda3R2+Q12Dl+PlQZt54jo+UELWG14Bv 94NUZ/Uv2uLaQVEZlr3h1Hc4tzhBBDa5FVB7eYnraDH8miujIPlbqVg9EZAsVMSRtTjj F3PYBQsvQ7Y8VS7Ig1Z54r52Ys6CaYAQHYSXz665dP1MUdeRDcDATiIT0GyJqtTQwLOQ 3puBiHzYIM4RieFSK4SYV5IZI54NiN5ci8YSGlyOqBLHAKd0VZzIjCk+rEVs5RjJ43iz 1H01wIyMtnGppxC/KUycL66sg8F5o4uUzc+l9vhUHvinreK7TdAULgsGXvoLsUCgpyrJ Gp4w== ARC-Authentication-Results: i=1; mx.google.com; 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=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id i197-20020a636dce000000b0043961d06e6bsi5020219pgc.787.2022.09.14.18.50.16; Wed, 14 Sep 2022 18:50:27 -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; 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=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230014AbiIOBgr (ORCPT + 99 others); Wed, 14 Sep 2022 21:36:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51924 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229564AbiIOBgo (ORCPT ); Wed, 14 Sep 2022 21:36:44 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 07D7F8C46B for ; Wed, 14 Sep 2022 18:36:43 -0700 (PDT) Received: from dggemv703-chm.china.huawei.com (unknown [172.30.72.57]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4MSfpb4P5vzmVCC; Thu, 15 Sep 2022 09:32:55 +0800 (CST) Received: from kwepemm600005.china.huawei.com (7.193.23.191) by dggemv703-chm.china.huawei.com (10.3.19.46) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Thu, 15 Sep 2022 09:36:41 +0800 Received: from huawei.com (10.69.192.56) by kwepemm600005.china.huawei.com (7.193.23.191) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Thu, 15 Sep 2022 09:36:41 +0800 From: Longfang Liu To: , , CC: , , , Subject: [PATCH 4/5] hisi_acc_vfio_pci: Fix device data address combination problem Date: Thu, 15 Sep 2022 09:31:56 +0800 Message-ID: <20220915013157.60771-5-liulongfang@huawei.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20220915013157.60771-1-liulongfang@huawei.com> References: <20220915013157.60771-1-liulongfang@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-Originating-IP: [10.69.192.56] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To kwepemm600005.china.huawei.com (7.193.23.191) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, 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 The queue address of the accelerator device should be combined into a dma address in a way of combining the low and high bits. The previous combination is wrong and needs to be modified. Signed-off-by: Longfang Liu --- drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c b/drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c index c172a52088b7..fce49c7f5db8 100644 --- a/drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c +++ b/drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c @@ -527,12 +527,12 @@ static int vf_qm_state_save(struct hisi_acc_vf_core_device *hisi_acc_vdev, return -EINVAL; /* Every reg is 32 bit, the dma address is 64 bit. */ - vf_data->eqe_dma = vf_data->qm_eqc_dw[2]; + vf_data->eqe_dma = vf_data->qm_eqc_dw[1]; vf_data->eqe_dma <<= QM_XQC_ADDR_OFFSET; - vf_data->eqe_dma |= vf_data->qm_eqc_dw[1]; - vf_data->aeqe_dma = vf_data->qm_aeqc_dw[2]; + vf_data->eqe_dma |= vf_data->qm_eqc_dw[0]; + vf_data->aeqe_dma = vf_data->qm_aeqc_dw[1]; vf_data->aeqe_dma <<= QM_XQC_ADDR_OFFSET; - vf_data->aeqe_dma |= vf_data->qm_aeqc_dw[1]; + vf_data->aeqe_dma |= vf_data->qm_aeqc_dw[0]; /* Through SQC_BT/CQC_BT to get sqc and cqc address */ ret = qm_get_sqc(vf_qm, &vf_data->sqc_dma); -- 2.33.0