Message-ID: <a3df8bf3-d044-b7bb-3383-cd5239d6d4af@suse.com>
Date:   Tue, 4 Jan 2022 09:46:06 +0100
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101
 Thunderbird/91.4.1
Content-Language: en-US
To:     Juergen Gross <jgross@suse.com>,
        Boris Ostrovsky <boris.ostrovsky@oracle.com>
Cc:     "xen-devel@lists.xenproject.org" <xen-devel@lists.xenproject.org>,
        lkml <linux-kernel@vger.kernel.org>
From:   Jan Beulich <jbeulich@suse.com>
Subject: [PATCH] xen/x86: obtain upper 32 bits of video frame buffer address
 for Dom0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?Ulh5WWZoeTFKRUJteHpFRVZQTWhrWk1PUUd0N094UEJwc1lldzBLZXpUZk5n?=
 =?utf-8?B?aFlxNnJMK1NvR0dJWXVrbUZYdzRKZWJmRVI4UE1sRXhrcE8rdGVHVVB1Y3Rv?=
 =?utf-8?B?M01qbDJ3NytRTERtZWNRZENaQ0JEYzIwTERja0RSc1R1M05IRHZrMEZyTGY1?=
 =?utf-8?B?M1JYWW04VVc4bnE3N1k3cTY0emdwR0pMMlMvUTJzV3R2RkxBQTZoTnJBelRL?=
 =?utf-8?B?OVl1K296eTdZenhOV2hmZW5JT1czMkNRTmttcjNKMzlUb2w3dVB5dlNkVmxt?=
 =?utf-8?B?UlR0RkhnU0pCS1JkOUNzRlhlSFZjZGM4NXZzUE9yL3pmNHJkdWJGdTcxTml2?=
 =?utf-8?B?b0luYk1NdVdMSUJmd0lFbUk0ZjNNNEp1UG5lN2NpM2xRVkJCTG8vQUF5SE9B?=
 =?utf-8?B?YmRQaE16MUdiWndML1lscWRsQmZlVmRWTUdCRnQvRVBOUEYvS0M1cmQzenJz?=
 =?utf-8?B?eng2MnRVMm5Kbyt0T0tLcXhjc0tIWXRSYWRLV2cxY2JpdTMvcDZ0TE0wQnNK?=
 =?utf-8?B?cGtJdFU3WlFld3hLV3pHUHNpTFhoYS9lM3J6YU1lVkxLWS95RHNEWUJ5SlVz?=
 =?utf-8?B?STZPc3RoV0JFbGNPcWxydUYrSjdVd0FuMFZKbFdDbkphUGVuN2JrcEJpcHAx?=
 =?utf-8?B?ci9zQUwybHgvbVY0Y1Y4ZHpnME1lTHJMbjRLQmo0aU93bGdrMkJDSW5tSjFK?=
 =?utf-8?B?b2JMZzlDcUFDUWUrNjZRTE9ZOG1KOHd4RnFkR1h3dmVnSUNrRzVEMTZ4VWtM?=
 =?utf-8?B?aGVwNytqelhUSWJOcE4wdi9sYzhaUGxOUXFhU2VGVi95VEpKcmtqenJKNmJB?=
 =?utf-8?B?a1JWVmR3d0J1anlmQmhyNDFIT3BLZEIzL0o3dFBzaXh1M201Y1ZjSVRpbTFR?=
 =?utf-8?B?NXJiT2RDaG4xcmRLRGtIcnpYQXhZYy9hSjk2Tzc0UUxDUEFEcDJtbThBV3R2?=
 =?utf-8?B?RFp4MGZlbkU4M0xuUEx5cU9xQmw4VXdYMFdydlhIc0ZyVmY0VmpPTlQ0dkhz?=
 =?utf-8?B?ZHZwTlNLR2V4V1BtRU0zRlAvNk1tQ0dmZldLOTRaSzJmSFN2R2hXRWdwOEl2?=
 =?utf-8?B?UTZDYmZpRzU4czFFVUpENEFrQTBBaUFMTmJVaEg2RmdNdmRacXY0MVFIMVlx?=
 =?utf-8?B?Mnl6YWpFeFJPdEZyb2tzOXpoMFNDN0h4Y090YlR6dkdTM0pvemswNzlUcVdQ?=
 =?utf-8?B?K0lFZTNtU3JjaVBSN1pwSTJrampzVUZXcGxMdXdiZStvS2ZVVFRQYlExd3ln?=
 =?utf-8?B?VGEyV1JRWlpMVThRV2dZRlNORDVjVm54SGJjNGNYZW5lcExKRGpYV2x3VnFB?=
 =?utf-8?B?SHlOVjB4Unk0QmE5enJjWDY2SUE2dytkMUNWTUlrTVJDR2tSSlBLUmpHeGEv?=
 =?utf-8?B?cjBzUWlYVDV1ejVqZ2dyUmV6UDVwSHRZTjB6MmhybDlnOXpBWml6Vm85Qzll?=
 =?utf-8?B?dk82eDdEemluUlE4V0NLalN5TWEreVBBTmJPN2ViNEcxb25sbklKdW53dHVL?=
 =?utf-8?B?YzNPNWxaMXlNVHZzMlFOOVVQemU2SkhLUS9oVDhzeElKOENzVERZMEM3N2JK?=
 =?utf-8?B?RFFmR3lpVXU4M2s1SklVRGtFelZUanFtQ3RweHBLQzhjUkpxZzNpcExTanJS?=
 =?utf-8?B?cjlzcTlrS3RzdGMrZmgwTUUyVEJyQUkvZVdrWWYvWlRjMmxkakgzWFdUTUp6?=
 =?utf-8?B?dWMxNXVMN0Vrb0xxNFRzdldKT0d5ZW9hUHdpQTZKa1FVZDdaMXRhNG9qdXZB?=
 =?utf-8?B?MlNVTlloaDR3SE5tMm5vRG1HZkY2TUVGN1VaQ05ValZXYlh2N1ZDbGxGaXdq?=
 =?utf-8?B?cTJJS2RYdjltOGU4Zk9VeDVTUU5tTUxSY2NzWTRTMlMrdjhRUitJbmdGVXpE?=
 =?utf-8?B?cHVwM2UxLzdWa2MxZmFNNW0rSFRYK3ZsU0txWEkxbTdZV1BlK05rSGZBb2Nu?=
 =?utf-8?B?aUpTSXBnVkZ3aXZNV0ltZFloT1V4eWZoOHptb2N6alh5aTdPNXhFMDl2NW1I?=
 =?utf-8?B?a1MrR095TUxaNjExaHdJczdwRzFyeWxNQ2N1eU54SWx6VGxHR0pWaWJoYXZW?=
 =?utf-8?B?OEV3ZnlrYTNpN3pIWi9JOUNOVTJvYkRjbWsxRnc4TytxR2w3UWRzK0NiWnkz?=
 =?utf-8?B?cU53K0hqay9pQVVzam0yVWdqbjNYSTE3V0M3SmZNdlgxamU2RVlkaFpnT2Y4?=
 =?utf-8?Q?W3LWpW1gsmg29owOOuoki+s=3D?=
X-OriginatorOrg: suse.com
X-MS-Exchange-CrossTenant-Network-Message-Id: a21f6fc2-9f83-453f-47aa-08d9cf5ea0a7
X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5600.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jan 2022 08:45:57.9908
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: natWC3ljDtGmHAP882L/X1rrI/qShyae1aL1wGYqhPn+xJ+qaJ1N3nnobIEFaTIlBEfErNC7EmpKVNdXJo4g0A==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB5741
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

The hypervisor has been supplying this information for a couple of major
releases. Make use of it. The need to set a flag in the capabilities
field also points out that the prior setting of that field from the
hypervisor interface's gbl_caps one was wrong, so that code gets deleted
(there's also no equivalent of this in native boot code).

Signed-off-by: Jan Beulich <jbeulich@suse.com>

--- a/arch/x86/xen/vga.c
+++ b/arch/x86/xen/vga.c
@@ -63,13 +63,17 @@ void __init xen_init_vga(const struct do
 		}
 
 		if (size >= offsetof(struct dom0_vga_console_info,
-				     u.vesa_lfb.gbl_caps)
-		    + sizeof(info->u.vesa_lfb.gbl_caps))
-			screen_info->capabilities = info->u.vesa_lfb.gbl_caps;
-		if (size >= offsetof(struct dom0_vga_console_info,
 				     u.vesa_lfb.mode_attrs)
 		    + sizeof(info->u.vesa_lfb.mode_attrs))
 			screen_info->vesa_attributes = info->u.vesa_lfb.mode_attrs;
+
+		if (size >= offsetof(struct dom0_vga_console_info,
+				     u.vesa_lfb.ext_lfb_base)
+		    + sizeof(info->u.vesa_lfb.ext_lfb_base)
+		    && info->u.vesa_lfb.ext_lfb_base) {
+			screen_info->ext_lfb_base = info->u.vesa_lfb.ext_lfb_base;
+			screen_info->capabilities |= VIDEO_CAPABILITY_64BIT_BASE;
+		}
 		break;
 	}
 }
--- a/include/xen/interface/xen.h
+++ b/include/xen/interface/xen.h
@@ -722,6 +722,9 @@ struct dom0_vga_console_info {
 			uint32_t gbl_caps;
 			/* Mode attributes (offset 0x0, VESA command 0x4f01). */
 			uint16_t mode_attrs;
+			uint16_t pad;
+			/* high 32 bits of lfb_base */
+			uint32_t ext_lfb_base;
 		} vesa_lfb;
 	} u;
 };