Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Subject: [PATCH v2 4/9] xen/x86: allow "earlyprintk=xen" to work for PV Dom0
From:   Jan Beulich <jbeulich@suse.com>
To:     Juergen Gross <jgross@suse.com>,
        Boris Ostrovsky <boris.ostrovsky@oracle.com>
Cc:     Stefano Stabellini <sstabellini@kernel.org>,
        lkml <linux-kernel@vger.kernel.org>,
        =?UTF-8?Q?Roger_Pau_Monn=c3=a9?= <roger.pau@citrix.com>,
        "xen-devel@lists.xenproject.org" <xen-devel@lists.xenproject.org>
References: <9a26d4ff-80a1-e0c1-f528-31a8568d41f7@suse.com>
Message-ID: <d4a34540-a476-df2c-bca6-732d0d58c5f0@suse.com>
Date:   Thu, 30 Sep 2021 14:18:12 +0200
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101
 Thunderbird/78.14.0
In-Reply-To: <9a26d4ff-80a1-e0c1-f528-31a8568d41f7@suse.com>
Content-Type: text/plain; charset=utf-8
Content-Language: en-US
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?Z2dFeTc0b0dsR0lVZzBIQ1RuUzd1VG9PSVBUcHJLVEQ1a2JWcmJOVDNGZ3VO?=
 =?utf-8?B?cFk3MFAvV0NwbWorKzJSVG1kajMwakNVcVpIb0hqY1RoK0tKWUUwSzJnN1NQ?=
 =?utf-8?B?bkFoWU5qNnQ0TFhQN1NDNDNvZm53UEhmSFBrdGRUcTJQNUE2Q1lTOU1QVWdU?=
 =?utf-8?B?WjVCSG1CZisyYytlcjJuQ0RLbnhIUkFWWGhmcDhkeXJMSTk0WWMwOFhiYWgx?=
 =?utf-8?B?T2xvVlBUdHcwQjdXZjIwZlVWcnBkdDlkZmtpRzZOOFREcHR4Ti9BdURMamVC?=
 =?utf-8?B?cGc1NHdLTjhhYXlUZjArTUZaSVd4UmE2YUtDWS9GcVozeUJDejcreTFBU05p?=
 =?utf-8?B?czB0bCs3bjBWYmt0RzNUUjdWQ3NJaUJuOXplQUM2VkVGaFEvdzNPbkx4cXlU?=
 =?utf-8?B?SXRyNzNPSnBuYXVjbUd1cW5ySGRzRHZlWmIvY2VVRUdpNWFiRkpKRzdoKzlJ?=
 =?utf-8?B?cWNvQ1lFcXd5eEJOU0t3cmFWa0lyYWRNc2s3OXhPQ09MMU5od0xYNUY5dkNo?=
 =?utf-8?B?OEhqbWNTVFE3UVdkc0RLem9rNjc0SVJoVU1mZ2JoMm1tb3VJbkQvZjVXV21C?=
 =?utf-8?B?ZW1jUDJORElod250dUZkcDdyK0FkOW1TQXNKRmpoNW9MTmN0ZlBTbDBTd1hF?=
 =?utf-8?B?ZnVudDJSTXA3cGhSVENTNUIzV002b0s0MkZVNUJsTDVjZWxLZy9ka2ZGMU5B?=
 =?utf-8?B?K2ZwTGxtK1FlRENhczlKYmJZdUpOWDNVa2cwUDdZL01HK3N2N0I0NWN4WmdU?=
 =?utf-8?B?VFZQWXBFakU1MERMaHBEOWsvNlM5SUhraHp3TURxd0F6YUNaOWlCcHM2Yloy?=
 =?utf-8?B?QTJPcXJoN3hydU9WRENKV1NVbWEzUzJURFBTRzNKMWp5ckZQVDZWMVN5Z05k?=
 =?utf-8?B?WjY5ZkpPYTBtMG5oQXdjeGxjaGt3dGhFOUUyU3JFdzcxOGptRkR5eG94TFFp?=
 =?utf-8?B?Y0JzZUdEUFdLM0hmbDE4WXFzbzRDLzBqSVdJQitBS2ZNbFBpM0ZFK3FVRXpZ?=
 =?utf-8?B?bEtQUEpIbldoMk9zQmJueGhkdnh4dit5R3VEdVBFTVZwRlBxY1o4NjJvSFR0?=
 =?utf-8?B?Nzhlam5oZmV5dlpCUTBGdlh2Y29PamJ2YlpJRUVpTzlqbFFmUjFPRkJYRUtB?=
 =?utf-8?B?Z0thbTZ2MnY5NkdEaWxGeGNxazdMQ0VXVXp0OFIxeVE0U3pZeUVEaE4veXRt?=
 =?utf-8?B?YzhyVHdZSDBaYzNLbks2a0hPMzZvc25jNTRNMktzdGt2bWE0M1hSMndpS0R5?=
 =?utf-8?B?Zk5qclpqZ2Z1V2JERTBHeTNrZkhPNE9Fb0FOZU0yTjY0ZFFiVU5rRHBleXpu?=
 =?utf-8?B?dFluZ290VmE3dXFYSWFtMmYwWnNrM1R2S0JKNVpVdDM4aWNsM0NhMVAyN1RO?=
 =?utf-8?B?MlgwY25lTkR3L0VyVTNmVGs1K0s2bFBMdjcrRUNnL2FIeEFLSDJsczRwZGN4?=
 =?utf-8?B?MHdzaEE1Y0NDTy9udU5KS2FKTE1BbG5zMXQ5b3JiejhpZjh5OFFUdTBjdmRY?=
 =?utf-8?B?cE1WSlU3eHQrMllpd2J5aGRGT3RZanU0ZzZXdWw1Y3VqajlHd0w2cGxhTFlI?=
 =?utf-8?B?a0JFRTZWQkh4NHhzQkRlWjR2REU2SE5USnByMGREMlZBM3hJRloyMFZ1enRt?=
 =?utf-8?B?OTBNY2lTNk1NVG9DNTN2NFF0Q0xCR1NKR1AxZDF6aEl5OHB0MGhnOEYzMVVk?=
 =?utf-8?B?Y0Vxc003c1h6RThGRnJaYk1NUURpVDRFc0o2U2Q2VFN0MmNlOFFCSEpyYW0r?=
 =?utf-8?Q?6tIrI0PS5qoWKsdkOQnxaEttlv2Tv6SmmjhzaWz?=
X-OriginatorOrg: suse.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 97f795b8-3159-416b-3e3a-08d9840c6144
X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5600.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Sep 2021 12:18:15.7101
 (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: 4PhDoFle6mwMbklMriNVIDQv396oC4+UoGaUr3VQ3/AOcsWIkvnvJLgwhiUCkSQlvH55gtdQOYoZWvI2LfNauA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR04MB6479
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

With preferred consoles "tty" and "hvc" announced as preferred,
registering "xenboot" early won't result in use of the console: It also
needs to be registered as preferred. Generalize this from being DomU-
only so far.

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Juergen Gross <jgross@suse.com>
---
v2: Re-base.

--- a/arch/x86/xen/enlighten_pv.c
+++ b/arch/x86/xen/enlighten_pv.c
@@ -1348,7 +1348,6 @@ asmlinkage __visible void __init xen_sta
 	boot_params.hdr.hardware_subarch = X86_SUBARCH_XEN;
 
 	if (!xen_initial_domain()) {
-		add_preferred_console("xenboot", 0, NULL);
 		if (pci_xen)
 			x86_init.pci.arch_init = pci_xen_init;
 		x86_platform.set_legacy_features =
@@ -1393,6 +1392,7 @@ asmlinkage __visible void __init xen_sta
 #endif
 	}
 
+	add_preferred_console("xenboot", 0, NULL);
 	if (!boot_params.screen_info.orig_video_isVGA)
 		add_preferred_console("tty", 0, NULL);
 	add_preferred_console("hvc", 0, NULL);