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;
From:   Jorgen Hansen <jhansen@vmware.com>
To:     linux-kernel@vger.kernel.org,
        virtualization@lists.linux-foundation.org
Cc:     gregkh@linuxfoundation.org, pv-drivers@vmware.com,
        Jorgen Hansen <jhansen@vmware.com>,
        Vishnu Dasa <vdasa@vmware.com>
Subject: [PATCH 4/8] VMCI: dma dg: set OS page size
Date:   Wed,  2 Feb 2022 06:49:06 -0800
Message-Id: <20220202144910.10349-5-jhansen@vmware.com>
In-Reply-To: <20220202144910.10349-1-jhansen@vmware.com>
References: <20220202144910.10349-1-jhansen@vmware.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?6oUUJiwdG9B0WjHt1bq1dvaIjZtqyttZu+GsejQRgG6+UzV+92Vd9wKKX9YV?=
 =?us-ascii?Q?U1Amj4OISxuQntN5dfTtwYEUdszfSesVZUvGseFOVIbfHcCkx4aXZDfkXcdb?=
 =?us-ascii?Q?xWQrwEwmDa8CqcyNZbA0d+GK0AxEOLj3NryuTW+AFQMorfecGJCdXD3cH0U7?=
 =?us-ascii?Q?J8JaZ5lF6Ejbz4Wdkktc00NOWsnJNsjx3HdrHPEQEStq1jIIDxDB8FJkI+Z9?=
 =?us-ascii?Q?0yke5WZEq3o0FJYfm3u8KFKXnq/uviJe/eG5ELWRneYXb8A9jKU44QHaH7hX?=
 =?us-ascii?Q?jwKP4MVq6M+PbetWZ+yTsJnWv0DSSerTAupp+Sxi89Ckqv9p+dyUU0zIXCFU?=
 =?us-ascii?Q?Wn4OSk8BzbjZqHqQOoM8sLDmkOA2eynVmGAyyvCzctvHe+dSy0Ot4l100pdX?=
 =?us-ascii?Q?LpbxQYnm6OLlsxDF/Vc+6UjhxnLx7EK3ByDSrFBg4T5gI2eEj205mfJ4gnI5?=
 =?us-ascii?Q?ePhxDa5CmF4ReiMql/2ZZUTuVFTTTPAqNNLZHe/5BHBZtI/hrQGwUdjwY//Q?=
 =?us-ascii?Q?9E0WmyBO4r/SxQ6VGU71MOfZhmxrTtgH43euVa8p84LFrQiUKeEiEYrlm0rX?=
 =?us-ascii?Q?EjThlpSyB+39qUzF9/iwyFXpSg6WuJ8WEZVIC0ZpqKCAY+9KBUD1dsgi61jY?=
 =?us-ascii?Q?iqU0aJmfG1xCUsvLRwxujUnVSx25BcUA0k+grIplWnqZgza5UK/DEvO6zu81?=
 =?us-ascii?Q?vuB31bYsCcYDjFGdlsB+YJYHuausMrbKOO5eBv0PXAUMYrtf7nUbEbIH9dsb?=
 =?us-ascii?Q?30R+xZJT1080dWSx8bNbBoW6h9TUfG4kRgTjONI3OAGlw1JgqNzBSoVWir3g?=
 =?us-ascii?Q?AoPLLTGMARZmb3/1GhPGDhHLGf4BKsUaCbDXc8BLBtv0s54UKTCYM9oJf9GO?=
 =?us-ascii?Q?RUgZ9IhkikJFqTFhnMAWJ78Wv83PaWpHxkDUEYCNYmx6Zev/G5yKV9F4V7WI?=
 =?us-ascii?Q?mOM6u1npezIctp5hmKo28RE7K8DvwL9pQ/0iezGNAYvfDAFOw89bFiUzBm5C?=
 =?us-ascii?Q?0Y2ESdnkB/yypbXMeAPtbawWR+JUicZo7/0KBHl6pwZzlBwu9sBmxQzMk/oz?=
 =?us-ascii?Q?a+hcHx+mdVemywwhfQLlRP/CcQwDoguRHen590azQCbOCFm6K814Nocl2NsP?=
 =?us-ascii?Q?dyLUT2dXN1sLn0tEmeGJaLJDUR+7Z+yhN8PpZn9hPm+gajKhAZ3gnrAHs2oq?=
 =?us-ascii?Q?n7HwgHxPgrwE+q4cSiBBWpEvA0u5GWNn5uOAiY5T6OPb3kx3aQpQUVfRZlnb?=
 =?us-ascii?Q?KC+oFgY3+nqyPXOYk0LiNU9QI933x1Uw05xC7RXMZn3rsIfdH+jWJzs1+BqV?=
 =?us-ascii?Q?HrNxNOmKu2YdvfQ2ukjTNqHW7V3lVwt3DJH9TYkMgLyAVHhj/ujOPTmnyALd?=
 =?us-ascii?Q?QTlW+TA8ZveNT9N4YB2bFUfn8o88/bFgDvvZX5GOIdynihJqJGN2eLU9MBzC?=
 =?us-ascii?Q?rmKbLfChKmzA51cs+1c/rCY8ixKH9GFj+IIteD7+2m6RHmjo1DHxvoXOdK16?=
 =?us-ascii?Q?d3i/zQ4tPP00ye73MZlRaf+n7r0hPwntJgDrgmlCWl6XRhYpaGrA8YB1yBtb?=
 =?us-ascii?Q?hJPPzBoZa8VDk/8aYoOJaCWJhylgraqsLGjy+k+cvNzuBrtP8gEgJfiNxbJn?=
 =?us-ascii?Q?209cILJcf853XDcmjYtJ5Xw=3D?=
X-OriginatorOrg: vmware.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 7abfa5ac-2cbc-4f80-d252-08d9e65c04a3
X-MS-Exchange-CrossTenant-AuthSource: BY3PR05MB8081.namprd05.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Feb 2022 14:55:14.2609
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: b39138ca-3cee-4b4a-a4d6-cd83d9dd62f0
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: ycY4Kb9eGCC3Zz/s4/y43K8hhAsF40bt01P3P/Cpjnk9z9GnomSBk1q0Lciyyyu3Ikgksz0z5CBVywEsRbsHAA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR05MB2803
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Tell the device the page size used by the OS.

Reviewed-by: Vishnu Dasa <vdasa@vmware.com>
Signed-off-by: Jorgen Hansen <jhansen@vmware.com>
---
 drivers/misc/vmw_vmci/vmci_guest.c | 9 +++++++++
 include/linux/vmw_vmci_defs.h      | 1 +
 2 files changed, 10 insertions(+)

diff --git a/drivers/misc/vmw_vmci/vmci_guest.c b/drivers/misc/vmw_vmci/vmci_guest.c
index 4bd5891ff910..ec76661bde7e 100644
--- a/drivers/misc/vmw_vmci/vmci_guest.c
+++ b/drivers/misc/vmw_vmci/vmci_guest.c
@@ -581,6 +581,15 @@ static int vmci_guest_probe_device(struct pci_dev *pdev,
 	/* Let the host know which capabilities we intend to use. */
 	vmci_write_reg(vmci_dev, caps_in_use, VMCI_CAPS_ADDR);
 
+	if (caps_in_use & VMCI_CAPS_DMA_DATAGRAM) {
+		uint32_t page_shift;
+
+		/* Let the device know the size for pages passed down. */
+		vmci_write_reg(vmci_dev, PAGE_SHIFT, VMCI_GUEST_PAGE_SHIFT);
+		page_shift = vmci_read_reg(vmci_dev, VMCI_GUEST_PAGE_SHIFT);
+		dev_info(&pdev->dev, "Using page shift %d\n", page_shift);
+	}
+
 	/* Set up global device so that we can start sending datagrams */
 	spin_lock_irq(&vmci_dev_spinlock);
 	vmci_dev_g = vmci_dev;
diff --git a/include/linux/vmw_vmci_defs.h b/include/linux/vmw_vmci_defs.h
index 1ce2cffdc3ae..4167779469fd 100644
--- a/include/linux/vmw_vmci_defs.h
+++ b/include/linux/vmw_vmci_defs.h
@@ -21,6 +21,7 @@
 #define VMCI_CAPS_ADDR          0x18
 #define VMCI_RESULT_LOW_ADDR    0x1c
 #define VMCI_RESULT_HIGH_ADDR   0x20
+#define VMCI_GUEST_PAGE_SHIFT   0x34
 
 /* Max number of devices. */
 #define VMCI_MAX_DEVICES 1
-- 
2.25.1