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 v2 4/8] VMCI: dma dg: set OS page size
Date:   Thu,  3 Feb 2022 05:12:33 -0800
Message-Id: <20220203131237.3380-5-jhansen@vmware.com>
In-Reply-To: <20220203131237.3380-1-jhansen@vmware.com>
References: <20220203131237.3380-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?yLulj6wanE/4CRxPVmLn80JVkt+B2yT6G3QSPgi7SIW1aCStKvqJqlhB9o9a?=
 =?us-ascii?Q?MRF0nzA/ptrxhkLeSgFc1oK5Yp5UNY7GKm7dEYM4uRrZS+h7108hG2UuHiJ6?=
 =?us-ascii?Q?GSvFOoFHtP8ucKtnxSuSaAjFoUrVkMLFROrHM32bESEICTnsZTCMY5PoseFa?=
 =?us-ascii?Q?Fimk+98xDKcgdtnOHFZ7lShLVT7kzDF7eqVcQBMzG6dhBmlwW3cObBD8Dces?=
 =?us-ascii?Q?my51xvzJhIuv9PF7N7bTsFQ0WrW0r9I81Wn1FkrO1SC8mGAyvgeIrKCtu1h1?=
 =?us-ascii?Q?LCbwpVJfRE4jxEiibzxjb+/KLZE2y7zJkVWXuOYrdwrzs+2dU+rpiob/1Bj3?=
 =?us-ascii?Q?DYlDdrHpH+fu9p8iCjQnIuX+uJPahEztvWzLafJ3PW5WU5b6G/lFihbG2rZr?=
 =?us-ascii?Q?H8W0nY9UVPR73MAxRpd9v9wLpBmSk3kaQa+5TbAn2+JVZhF5qm/FfT28gV5b?=
 =?us-ascii?Q?Hd4NJFWNRPiHdQ6TGVSdSudFdqMyPkbmHYTSKChDtt8v5oAfu12yH0Ci3KST?=
 =?us-ascii?Q?PCGvC7JvpoZVVQh5+FPjxzD9S9WaTQbrm6rcvqS/sywuKoUPPOqcuMDY3bTv?=
 =?us-ascii?Q?3hcY9f3jDNngK+wsnLnZ0hEqt0JWeBnF1MSy+SUgZtdGsy7bJGognuZ7cfIb?=
 =?us-ascii?Q?Ha/B6DSYsW4ia0q8GMlF+nvJO95+EamYn5dYlyV0r2bimfaLYkJma7Pe8klM?=
 =?us-ascii?Q?KVHSkOxQTM7VNDHEWVE66al9vxaPjG8vQwAet4dlMoJQOK93yRkcm+MkvQqs?=
 =?us-ascii?Q?qz7utsBVXQ27L/ooem5DeaNj9Hw/1f9dVJk1nc5tpeMRJ4g/O+yfF+t8lSzU?=
 =?us-ascii?Q?/O+/TEO0mJh3ar3aW/CEzxsGG0+CwpEZuFAuAWQRoUqRFwmhuCs56tw1uTOb?=
 =?us-ascii?Q?l6qM0fELlZVEjCNAWBuK82Q1bUUzkQ5hu0bXq2xy3X1GrA0YzmKNbjAJqi+Q?=
 =?us-ascii?Q?PFCvgOV86Tb26qXV61cIqz8Tb8PfLN0uUY+qaBD+PmLNKWPZR31SxI/gbA6R?=
 =?us-ascii?Q?ENw180coprQveXcnekpYsyDt25H1v9Bwqp80BeEa/uwG6ziG+GzMw5odvpNK?=
 =?us-ascii?Q?OtOZVpXAcYewNaz6HF1fHszyibrUhRwWckJ1ZTGfAoDL6U/Q1O2cyDTBaS3p?=
 =?us-ascii?Q?u6J9kiWcgUJepACCKYFmSoXMBLm9Jv6d2+5YOUmHZjPRVO1/9l6cFq2wCcm/?=
 =?us-ascii?Q?0qTF6ZPagHHsaqunyL+Gg2Q7oAXjm14K9C9ZXIJLAXa8/2+/FqUw2QInciv3?=
 =?us-ascii?Q?xlvn5VQPugQqNLhUyxuyuRbZnlrR6XBmWYucQTvj5sN+4d/iEIsZlYHpzPTS?=
 =?us-ascii?Q?++bTlsLk3WQ7IYAikjZx3FxSYDbVnx7RZ7c3fE8mqjKeEMget2ZRGYgCvGpj?=
 =?us-ascii?Q?pIdnGS6YDdRB7lUH0nDtkWYRka4TerAtIARMeDb2u24+Ib7AIZuEkQWLQvhG?=
 =?us-ascii?Q?HB71o6/yHPu7k5nwbyMLst2R3HvjudWkMtp6YmgAsegBF964c/xTFn0On9eq?=
 =?us-ascii?Q?Jjf2Gvrjqt1c2cgnpGhx+846JwPzbtENNwhlK9nVZtrL0RFyuSaogG+sfqds?=
 =?us-ascii?Q?aUc/guqkMbMiR5CgrKd10HVnNVeiqSpafLm+vchd5Cs0X9zrR8UgeY7EvYHv?=
 =?us-ascii?Q?mbf93WW3/3qe1UdAvfkqvgs=3D?=
X-OriginatorOrg: vmware.com
X-MS-Exchange-CrossTenant-Network-Message-Id: d95cbdc3-2f1e-465f-6057-08d9e717a300
X-MS-Exchange-CrossTenant-AuthSource: BY3PR05MB8081.namprd05.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Feb 2022 13:18:15.7110
 (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: TVi+/JZILtFphWBgy3YOuRHF10TstVnsqjElsG+Ahj23O2JtBqyJ8RPBLlvsDl8T3NZFAh4YnBxDESnt+6xtNA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR05MB7150
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 5a99d8e27873..808680dc0820 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