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 3/8] VMCI: dma dg: detect DMA datagram capability
Date:   Wed,  2 Feb 2022 06:49:05 -0800
Message-Id: <20220202144910.10349-4-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?6T+SbrF/bnKMBYf/w/mSkhFapyrrHlP+C6kFMT5vISOQ34kwfLasZDcJdMbT?=
 =?us-ascii?Q?tVvxSFd6vZURcm1GXvpJE6qrzT1ppFqOw/Y6dh9mDBpQL+XBQxOXNEoLJ7Nd?=
 =?us-ascii?Q?TJgd5OSZ4DaJn43sxQQfep3ZhS6a27PftuAn7KjUg6JBXKtLrd0iFlM8QaIJ?=
 =?us-ascii?Q?7AP2+7OH94H8yPK2Rr6eKo2n61JyxYLVrRKQBUsnAuis8iatEQfqUR1u/28g?=
 =?us-ascii?Q?o9cDdf4IYqIuu67B5N7U3W6KasqYAdQDjepPYjmFFRY/n2XbUTyPheOtBFoN?=
 =?us-ascii?Q?+1OFN5eNCIFzTXk2ewujr3nY0mfZ8roTRxB3As0xW21G3mbbHTPuJB6Ll/8F?=
 =?us-ascii?Q?yxfFo8WltuX7kPWeJYeoRXcXdfFk1FlvDq89a8VYbhDlBh8am5ZG28Yt7cZU?=
 =?us-ascii?Q?s4Qnbl0obNZZffPrgc1Qh7a1BwhZAXSAMIVms5Ci+4rmNryZBGqxlbLL8DmA?=
 =?us-ascii?Q?B2tn7jfWo7ArpOqDDetAph7pJwXItD3T0yCs3E3GPVlussMTEgYqWKHgcp7M?=
 =?us-ascii?Q?mj0paOhDmmIZPp+YZoX0dxTRzTrKbrVPnrUfxPolZoV85rIL8WiQtjd2yxtx?=
 =?us-ascii?Q?E+3fEjDzrdupazPNMxBq7aCMwWo5xR75n1PSEFq5LySa737JIWhdc9qO8BJG?=
 =?us-ascii?Q?S0OfyzfPHc3IH4BHEkl9Vs887kFXDUxvGudqOcXF96gckeDRvHYJaUoNmQkz?=
 =?us-ascii?Q?xS/yjDIifVb0Ix0f4PKmtaxHrMzvaOO4lVboUk2jqEtufp9CLTR9/4y63o9C?=
 =?us-ascii?Q?hEAMLAlQv1rV63MRwpSwdUJMHn7aTZn+Pgf9384MzWjCutyWVq0x3TvWIUMl?=
 =?us-ascii?Q?OIfUL6uj3sP4NVoXA/6hOgyLBTQQ7BSwRH0HwO3lzXW4Qaf+2/bu/uoxVOcd?=
 =?us-ascii?Q?5UOwXAfaXTT9ixwx7exsxtj1jCmAzsfrD9FE5cWxo9zX6eUdMKAp/V/1wNTR?=
 =?us-ascii?Q?cALXIEurCPwxZTnOacIqrHZtOnlZhz4wmslPpEONFeOm/HyqCGM3EOSQ81VX?=
 =?us-ascii?Q?ZUxx9K7iHCAkzukCqTrrDcA7KV0VDHeRR3pv102f5BbyAjEj6LtriIpT6myS?=
 =?us-ascii?Q?LDxrzPqKtfZ+YCdUCJ1Rodeg1uiRotW3BsrnzwS9TrS7Z6eYnheIPyDTnXks?=
 =?us-ascii?Q?tfx1wOZWnzhEzkMrcqN/Mm20yPfUsR+y4RJ6atiWiO27U8j5nwJrk9LKutEf?=
 =?us-ascii?Q?ef5ZzWsv8KVtLgCVk7ZwqoyujPJ/DmbaFi1/v6oQC7HJE3qfvXWZu41+yn4v?=
 =?us-ascii?Q?fy7UzZKEDkNjXk6Pstnv6Ok3GX62a9FwA9aAQ4R7SPEnBhQKaoPMAHwCUmid?=
 =?us-ascii?Q?EWLcYUa78RvpB9nN6Mova94vT8QuU1/1jXxmV+lY0vRBlaUKBB2iataQhduv?=
 =?us-ascii?Q?3Z9yDi/ik/EvLL3T21ZOuIQVGzpKF1IUwmBYJFbCXAmtUvVm77dNpmpfwsSN?=
 =?us-ascii?Q?cU1i/tSe94ZQ5MdoPi6tpYS4A6+PF0hci7WTShfaIr4qROVKN51Qh0XWbe7I?=
 =?us-ascii?Q?3axoZpHlKzo1gJhpm4ymVXO2fOl7ZRqIeQ0pvSXpy+TV5zIL57RKi5yzYsAf?=
 =?us-ascii?Q?RRC9Q7C5xBJZ0iT8AnjZrfVg8iOgA6beK633Techp1H6S3OGSYxXJtJSMxJB?=
 =?us-ascii?Q?gSZTdx2fJwnAvatawhc8AQE=3D?=
X-OriginatorOrg: vmware.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 99a384e9-84ba-401b-0b99-08d9e65c0468
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:13.7454
 (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: uZx6YUyyff4ZTtRy8lacz7n+w4OsMdQNTKVQnEgmGim3qdJZ5PteV3AfLnyhAfRTWEHFrw3hpuKb+xPbeZXU/g==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR05MB2803
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Detect the VMCI DMA datagram capability, and if present, ack it
to the device.

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

diff --git a/drivers/misc/vmw_vmci/vmci_guest.c b/drivers/misc/vmw_vmci/vmci_guest.c
index d00430e5aba3..4bd5891ff910 100644
--- a/drivers/misc/vmw_vmci/vmci_guest.c
+++ b/drivers/misc/vmw_vmci/vmci_guest.c
@@ -565,6 +565,17 @@ static int vmci_guest_probe_device(struct pci_dev *pdev,
 		}
 	}
 
+	if (mmio_base != NULL) {
+		if (capabilities & VMCI_CAPS_DMA_DATAGRAM) {
+			caps_in_use |= VMCI_CAPS_DMA_DATAGRAM;
+		} else {
+			dev_err(&pdev->dev,
+				"Missing capability: VMCI_CAPS_DMA_DATAGRAM\n");
+			error = -ENXIO;
+			goto err_free_data_buffer;
+		}
+	}
+
 	dev_info(&pdev->dev, "Using capabilities 0x%x\n", caps_in_use);
 
 	/* Let the host know which capabilities we intend to use. */
diff --git a/include/linux/vmw_vmci_defs.h b/include/linux/vmw_vmci_defs.h
index 8fc00e2685cf..1ce2cffdc3ae 100644
--- a/include/linux/vmw_vmci_defs.h
+++ b/include/linux/vmw_vmci_defs.h
@@ -39,6 +39,7 @@
 #define VMCI_CAPS_DATAGRAM      BIT(2)
 #define VMCI_CAPS_NOTIFICATIONS BIT(3)
 #define VMCI_CAPS_PPN64         BIT(4)
+#define VMCI_CAPS_DMA_DATAGRAM  BIT(5)
 
 /* Interrupt Cause register bits. */
 #define VMCI_ICR_DATAGRAM      BIT(0)
-- 
2.25.1