Received: by 2002:a05:6359:c8b:b0:c7:702f:21d4 with SMTP id go11csp484146rwb; Thu, 22 Sep 2022 02:20:14 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5dH9F0/BGAY5ZkC3OzG5HctcKwN/U71WgLreei1m3PvEcu1qLdFNVgwhw+HmMbDNUMb/rJ X-Received: by 2002:a17:902:f68d:b0:178:41dd:12ad with SMTP id l13-20020a170902f68d00b0017841dd12admr2475656plg.25.1663838414243; Thu, 22 Sep 2022 02:20:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663838414; cv=none; d=google.com; s=arc-20160816; b=L9cgcB88wyTdlRxE880+s2GqnPgQSKkzdDOtFmbFBgvGWr7Fr5LpuYy4n0jDPLrGPB k+cwa7pA8uprALXLRWJKe49QKmW2CO+AcEbNJIH30chy3BL5ciYG2IA3KVZlmBi2TRzn SZwUlMhVuWyaLfEefq16EYfMJPzhfu2DIGHzywGxudDv0TrUN5n9yJOIvD66acm8q7fK wmuWQefu9X3Ajt42OwgPFKvZgwWDjkAh6JvgjvhLnkGn4OoXE/pXfl42t6/ye7Jir8tB /jVlKgrNtssl9xOJwkkcK8rbbN5AEdIoL8dTpkova2H7K3Vu6RlrVOn3w+VXScNJwreI Ujrg== 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=ypqaD7YLRfAMBsulaqOrN97eU+htpD6RWKoVgG0iCTY=; b=MA+R4ITZ1RJGMFpWGs7O8VRrmlhcAyzs4l8RJye9dkpwERrB7ZnSRHsUpIO0HzOFLG W81G6P5bodAkd2Dac7tC1hDdFleD0igWI2gcFzUuJmGcJliHoNFK2gZpmqmTAd+dhykX EynatoPud1jVDgx8YQ/hvmBYTt7XXE5hRMmRdRXiFEMnRRjb+nQHJg4kaw3QA5YD+Wse +jm9rZlcaHHVXkxgMu4hb9SHPmLKkK+B/6k/ysdFMVoEuC1FXa4Mqr7TCsvo2CDXRsRK aVBpSI2DvnzQCOkjupx7YFsSR1LQFzmsyfD5Xf5DWEaiWTVLncrFEq25/8vt2dRNEIk6 YVIg== 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 f187-20020a6251c4000000b0052f7fb6f2desi4978432pfb.154.2022.09.22.02.20.03; Thu, 22 Sep 2022 02:20:14 -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 S230047AbiIVInV (ORCPT + 99 others); Thu, 22 Sep 2022 04:43:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41038 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229766AbiIVInU (ORCPT ); Thu, 22 Sep 2022 04:43:20 -0400 Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4523CD12DC for ; Thu, 22 Sep 2022 01:43:19 -0700 (PDT) Received: from dggemv704-chm.china.huawei.com (unknown [172.30.72.57]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4MY7zR0wJSzHqKx; Thu, 22 Sep 2022 16:41:07 +0800 (CST) Received: from kwepemm600005.china.huawei.com (7.193.23.191) by dggemv704-chm.china.huawei.com (10.3.19.47) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Thu, 22 Sep 2022 16:43:16 +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, 22 Sep 2022 16:43:15 +0800 From: Longfang Liu To: , , CC: , , , Subject: [PATCH v2 2/5] hisi_acc_vfio_pci: Fix device data address combination problem Date: Thu, 22 Sep 2022 16:39:25 +0800 Message-ID: <20220922083928.58797-3-liulongfang@huawei.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20220922083928.58797-1-liulongfang@huawei.com> References: <20220922083928.58797-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 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 7ce656a7cf5c..0638a8a6b0c1 100644 --- a/drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c +++ b/drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c @@ -528,12 +528,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