From patchwork Mon Sep 13 17:36:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sunil Muthuswamy X-Patchwork-Id: 1527521 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=microsoft.com header.i=@microsoft.com header.a=rsa-sha256 header.s=selector2 header.b=A7HWhlNm; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=linux-pci-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4H7YZJ34Jkz9sVw for ; Tue, 14 Sep 2021 03:36:56 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243337AbhIMRiH (ORCPT ); Mon, 13 Sep 2021 13:38:07 -0400 Received: from mail-oln040093003003.outbound.protection.outlook.com ([40.93.3.3]:4645 "EHLO na01-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S238180AbhIMRiG (ORCPT ); Mon, 13 Sep 2021 13:38:06 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CNV+Oh3NaHofBy+UEewZVdOElZuuqpiC0MN6/efrinyWAplEhWUdVnWj0m0cbZDIt+i5hzTsV4Pkc8EPJso906+TOjEHRGvq/3ZNUgHqvK5RpjZMAZgi89rvS4edowe6eodcp9I5zrxlmIukbLN6EWkJx15+MNUO34IoegCpgcKCGVtiCKdFYPdkH0ieFR/DT/zNDzW2bTBwo1O2duASqcoyNUoS5H3krZ755PPKTZ5gKsxuqt3FOBQRTi3yM5U9eM46v/jOt05L+tCdfRH1HQ4Zbq3iF3+DwkfyNKJHB3QTxPr3NyOHKUIrUCK6ghc/Sq/vRrYn+srI5tdk9YSpQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=Bqjwzcjy2bIUQyMyzt8ZOHCz2SAMCWTBOou43sef7Dk=; b=TmWw71itBeh5b9vj/blHFUHClTuIXQQiZyIPM1RLT6ThIcCf1l9T5ERXlgc9gduW5G6AzH/FXbYeE0jhrW6/+d+iApPO40fA9/yj7AJ8UeDicC4KSUeG2vYR1OZA2gSbjVV0DBiRnSvWlXuMffymF8QC5VdD79sepgYLLNAfJHkQwdNnoL+NlgDdcUMZ27NalbL1Uk4Hew/fCMWFRE71KgQFGlgSH/8jwEsQpisPj/FcR756WszFFfQ3DUdQAtw4Nrk0rrTC5cvds6tigOGXxTYOD8Q5ft1phQDKHbIulzoC25qPuuGBocnOF7bxf14l9e7nU6EQhVCK4rMUgvSDsA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=microsoft.com; dmarc=pass action=none header.from=microsoft.com; dkim=pass header.d=microsoft.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Bqjwzcjy2bIUQyMyzt8ZOHCz2SAMCWTBOou43sef7Dk=; b=A7HWhlNm0RseSDl8U+4COySHk7M+MGZHbn/I2Vj9taGAvQdptB5+x4HvURRoVG3HFajzkDvj3xCelKm2him5oj53RzHjWVGQMzDrNOcKdevNfsjTpe3S63rxs3sP/4camb9WreWmpxRia6i/OSLzY+xwyzWlyh//BaP7IYdi3X0= Received: from MW4PR21MB2002.namprd21.prod.outlook.com (2603:10b6:303:68::18) by MWHPR21MB0830.namprd21.prod.outlook.com (2603:10b6:300:76::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.8; Mon, 13 Sep 2021 17:36:47 +0000 Received: from MW4PR21MB2002.namprd21.prod.outlook.com ([fe80::b134:7809:fcff:8c8b]) by MW4PR21MB2002.namprd21.prod.outlook.com ([fe80::b134:7809:fcff:8c8b%4]) with mapi id 15.20.4523.011; Mon, 13 Sep 2021 17:36:47 +0000 From: Sunil Muthuswamy To: Michael Kelley , Boqun Feng , KY Srinivasan , Haiyang Zhang , Stephen Hemminger , Dexuan Cui , Lorenzo Pieralisi , Rob Herring , =?iso-8859-2?q?=22Krzysztof_Wilczy=F1ski=22?= , Bjorn Helgaas , Wei Liu CC: "linux-hyperv@vger.kernel.org" , "linux-pci@vger.kernel.org" , "linux-kernel@vger.kernel.org" Subject: [PATCH 1/2] PCI: hv: Make the code arch neutral Thread-Topic: [PATCH 1/2] PCI: hv: Make the code arch neutral Thread-Index: AdeoxSGQR+XTDCnuQJejgIDf8UzhEg== Date: Mon, 13 Sep 2021 17:36:46 +0000 Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=microsoft.com; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: a4fa2991-034c-423e-c0f3-08d976dd0ffc x-ms-traffictypediagnostic: MWHPR21MB0830: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:10000; x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: DqBRif7FAoruaxdJ53Ii0Sg3FkxAjvlAZ319AKd9AHJ7EaZR7GLLtvjKumXP1aDBfEW+AeaLxkIydzdKM30P+5N4cgmZnfld3L8Yd8xclifxwP+ptzJXICDVDPr17ThIKNCX2+DKniPl/FEZWjw6wuvJtZ1WvTyh5tEq4kxsvuYwH7EYdVPu5nJRKPJ+xQZ6qpN5J2XIIs9vbs5URwrEsj7Y6e3IWA4SekQOveCw3qt2Ne3tJm01AlMpWRnczWn3isS4nWinZ4dLVXSI4ZpnkxPEnE0fWN5kCNPGE+j/sFUkY0MMUyt9DsIXmZQEmKrrLzqzK9lh/2kxOOXQMPzQ6lQ51joE2b+o3yVXYTqylahTcio4T3bHxf5KwmBbbvAqe24ogeJgtZySQfdG0vZap0fAQKvGIm37amjTHvxq7u7gm5Kx8mBX7JN3hTA3w+gOblU5LYLa9B/9vOwOXCiVutp6V0uKGDwaFUwCpIHKs0DX9HJUHo5IkqnwVCXTi6jWmcZvDC4vMtB7r8sbdAjDuMK/O5APAjEmQNljh5lgfVWeZ6gOLugUYvwEkxR5BsGRAKPH16Tl7exW5w9yp6HZkZkTujoXznA9BshXrQY9Trde46Pq88iF+Di0YI687DES5owKug/L0Hb2s0uMSWMaPfKqas0I1k6bTK97v/ie5uTYP0rFMWqI/scVc+q2amrWpFV9lV8NdvP6D3lqWKXMztJrTQ1w+lmwOCUEczDDojk= x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MW4PR21MB2002.namprd21.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(366004)(6506007)(9686003)(508600001)(76116006)(55016002)(52536014)(83380400001)(7696005)(38070700005)(71200400001)(33656002)(66446008)(64756008)(82950400001)(66556008)(66476007)(82960400001)(66946007)(86362001)(38100700002)(186003)(122000001)(921005)(8676002)(8936002)(8990500004)(2906002)(4326008)(316002)(54906003)(110136005)(10290500003)(5660300002);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-2?q?8HKPSXME+4XyV06IYX5esN9?= =?iso-8859-2?q?sFEQ41PUqZk6Yv+1mWhIrjgf2MLx7o9CJxPv4drbCMEbgk6UUVIXJqU7DhmW?= =?iso-8859-2?q?CIUMKkQsk3CLObT8hVsme1VL/ZoSa3GePpwbwJtkbeCZG1fDTldKibFg4A9F?= =?iso-8859-2?q?9DbqSv8OmhG9s9zaWcOMrkxSsG1kdoavyI6vy7LNg+sSblNsOkxOqlt8ye2t?= =?iso-8859-2?q?lbEMjwO9fSvrdmjdo0v5nNIkX89a5ASD2EIgJVHfzK5NjO3LjGbIiMjrOuIw?= =?iso-8859-2?q?g2Bhv0dvD3dhG3YhIJmx3oFyOMdYwZvz4wNFjUVmlD3XvgxFdmwS3HoaPfQM?= =?iso-8859-2?q?Xtr5hMC/ClxmQDh5hzFisppGCfRJNyObrZ6rjXQ6cLpiZP86mxeWPgDVqiK+?= =?iso-8859-2?q?pq0Ftors1T1YSQ6Ga6wZmK8uurRw9YC+2jip2PifEFTy+lODwNIL0sAEPGpA?= =?iso-8859-2?q?ul3P65P8J965JRKAaYNyYiBRkXWSE92/r5ottYpBb5CFmXLkeUKKbhUEKwvy?= =?iso-8859-2?q?HFlLIeVL20FI3EoOaF3wqDU4hex5tQWkk0we9xQBrhtcypYfM0bRGBi2EmzV?= =?iso-8859-2?q?LTsyu1Kt22LolFjsBlKBd7FjuhyWDNcJ0Cp2woBrIY2SJTjckP5ojf4oOeBr?= =?iso-8859-2?q?/m+6McmOWkmeNwi6doMXYPWoRAc2gCNPm6X2ZEroJwb7FwQx0yl3kGIM3H9n?= =?iso-8859-2?q?wasuQFuMm10tj0Rr2D8G3l7dJAkWdgUj0DfdUot9Z6Z40bA/bQ0tulp58+cb?= =?iso-8859-2?q?ZurDs/g8M6ln5nC+hKBCjYMQl9Zx3v3d5DtN1dmaJcvgot0u+nNqSwBqliRS?= =?iso-8859-2?q?OEoNbMlRZpHTZ1Tc97Vzx37q+58jfiNsxcP+LcWYZrRAw0I43se/CRVeK+TD?= =?iso-8859-2?q?5zqJFBAgTZVI4F8WgBfrZZ+qKKoyn30zBBCMXy9uF6AIw4OvgX7xOugcmiQM?= =?iso-8859-2?q?QFdqPTqZa28KsemUWWa2aE04D6elU8aMAfgKQO4vACkMT8TAc8b7fo/6ZVur?= =?iso-8859-2?q?MuWi4cy166LEGdl6Z8EkNHFKtb/fNCZvLtgjYDH3nZu/SxWtJgNrfd/ejr6q?= =?iso-8859-2?q?C64FEMke+skkMZMjePhgvASOI0rQRnJX0qz6SJT7N7O25RCG4Srk2fpWRhXk?= =?iso-8859-2?q?fgq6weQxYqLlx+wK+asjOXYYlm1BhHt6WUPpkoYzEJDG5XdzebeVmkKZpWZJ?= =?iso-8859-2?q?Qg4f4WMByqq8AQw6AvApGFZmc09MSBLnZZ/IOO3EDNzKPFx2D/nlmCth00Oc?= =?iso-8859-2?q?kmtrbdOebWR2iPtvnl9sBZ2BjfxkNBXCGtM0kMlgzVcBVTe13MYjsUD7BiTN?= =?iso-8859-2?q?6gJfZ/zdZRAU0F0EfWf81w8SKFHt930zqsR4WlhsaCf1zh8lFM1AOx/py7YL?= =?iso-8859-2?q?kPKYrwIMeVDKjVMAdY439oRQNCfkr+IS2qjVo9E9L1gKFgCtGfWuARoHG+tO?= =?iso-8859-2?q?0gvFC?= MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MW4PR21MB2002.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a4fa2991-034c-423e-c0f3-08d976dd0ffc X-MS-Exchange-CrossTenant-originalarrivaltime: 13 Sep 2021 17:36:46.9225 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: dmWAksxVL+vkvdyDzSckacIUhdD//L39cZCzC2HHa39IX5iit+X/PypnJM7hH1WR5SrFBRZzwXq1AqL/c6xW5H4eRGvIhzf9LMPYDtcxa2Q= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR21MB0830 Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org This patch makes the Hyper-V vPCI code architectural neutral by moving the architectural dependent pieces into arch specific code. This allows for the implementation of Hyper-V vPCI for other architecture such as ARM64. There are no functional changes expected from this patch. Signed-off-by: Sunil Muthuswamy --- arch/x86/include/asm/hyperv-tlfs.h | 33 ++++++++++++++++++++++ arch/x86/include/asm/mshyperv.h | 25 ++++++++++++++++ drivers/pci/controller/pci-hyperv.c | 44 +++++++++++++++++++---------- include/asm-generic/hyperv-tlfs.h | 33 ---------------------- 4 files changed, 87 insertions(+), 48 deletions(-) diff --git a/arch/x86/include/asm/hyperv-tlfs.h b/arch/x86/include/asm/hyperv-tlfs.h index 2322d6bd5883..fdf3d28fbdd5 100644 --- a/arch/x86/include/asm/hyperv-tlfs.h +++ b/arch/x86/include/asm/hyperv-tlfs.h @@ -585,6 +585,39 @@ enum hv_interrupt_type { HV_X64_INTERRUPT_TYPE_MAXIMUM = 0x000A, }; +union hv_msi_address_register { + u32 as_uint32; + struct { + u32 reserved1:2; + u32 destination_mode:1; + u32 redirection_hint:1; + u32 reserved2:8; + u32 destination_id:8; + u32 msi_base:12; + }; +} __packed; + +union hv_msi_data_register { + u32 as_uint32; + struct { + u32 vector:8; + u32 delivery_mode:3; + u32 reserved1:3; + u32 level_assert:1; + u32 trigger_mode:1; + u32 reserved2:16; + }; +} __packed; + +/* HvRetargetDeviceInterrupt hypercall */ +union hv_msi_entry { + u64 as_uint64; + struct { + union hv_msi_address_register address; + union hv_msi_data_register data; + } __packed; +}; + #include #endif diff --git a/arch/x86/include/asm/mshyperv.h b/arch/x86/include/asm/mshyperv.h index adccbc209169..9c53dfef360c 100644 --- a/arch/x86/include/asm/mshyperv.h +++ b/arch/x86/include/asm/mshyperv.h @@ -10,6 +10,7 @@ #include #include #include +#include typedef int (*hyperv_fill_flush_list_func)( struct hv_guest_mapping_flush_list *flush, @@ -168,6 +169,30 @@ int hyperv_fill_flush_guest_mapping_list( struct hv_guest_mapping_flush_list *flush, u64 start_gfn, u64 end_gfn); +#define hv_msi_handler handle_edge_irq +#define hv_msi_handler_name "edge" +#define hv_msi_prepare pci_msi_prepare +#define hv_msi_irq_delivery_mode APIC_DELIVERY_MODE_FIXED + +static inline struct irq_domain *hv_msi_parent_vector_domain(void) +{ + return x86_vector_domain; +} + +static inline unsigned int hv_msi_get_int_vector(struct irq_data *data) +{ + struct irq_cfg *cfg = irqd_cfg(data); + + return cfg->vector; +} + +static inline int hv_pci_arch_init(void) +{ + return 0; +} + +static inline void hv_pci_arch_free(void) {} + #ifdef CONFIG_X86_64 void hv_apic_init(void); void __init hv_init_spinlocks(void); diff --git a/drivers/pci/controller/pci-hyperv.c b/drivers/pci/controller/pci-hyperv.c index 62dbe98d1fe1..b7213b57b4ec 100644 --- a/drivers/pci/controller/pci-hyperv.c +++ b/drivers/pci/controller/pci-hyperv.c @@ -44,8 +44,8 @@ #include #include #include -#include -#include +//#include +//#include #include #include #include @@ -1192,7 +1192,6 @@ static void hv_irq_mask(struct irq_data *data) static void hv_irq_unmask(struct irq_data *data) { struct msi_desc *msi_desc = irq_data_get_msi_desc(data); - struct irq_cfg *cfg = irqd_cfg(data); struct hv_retarget_device_interrupt *params; struct hv_pcibus_device *hbus; struct cpumask *dest; @@ -1221,11 +1220,12 @@ static void hv_irq_unmask(struct irq_data *data) (hbus->hdev->dev_instance.b[7] << 8) | (hbus->hdev->dev_instance.b[6] & 0xf8) | PCI_FUNC(pdev->devfn); - params->int_target.vector = cfg->vector; + params->int_target.vector = hv_msi_get_int_vector(data); /* - * Honoring apic->delivery_mode set to APIC_DELIVERY_MODE_FIXED by - * setting the HV_DEVICE_INTERRUPT_TARGET_MULTICAST flag results in a + * For x64, honoring apic->delivery_mode set to + * APIC_DELIVERY_MODE_FIXED by setting the + * HV_DEVICE_INTERRUPT_TARGET_MULTICAST flag results in a * spurious interrupt storm. Not doing so does not seem to have a * negative effect (yet?). */ @@ -1322,7 +1322,7 @@ static u32 hv_compose_msi_req_v1( int_pkt->wslot.slot = slot; int_pkt->int_desc.vector = vector; int_pkt->int_desc.vector_count = 1; - int_pkt->int_desc.delivery_mode = APIC_DELIVERY_MODE_FIXED; + int_pkt->int_desc.delivery_mode = hv_msi_irq_delivery_mode; /* * Create MSI w/ dummy vCPU set, overwritten by subsequent retarget in @@ -1343,7 +1343,7 @@ static u32 hv_compose_msi_req_v2( int_pkt->wslot.slot = slot; int_pkt->int_desc.vector = vector; int_pkt->int_desc.vector_count = 1; - int_pkt->int_desc.delivery_mode = APIC_DELIVERY_MODE_FIXED; + int_pkt->int_desc.delivery_mode = hv_msi_irq_delivery_mode; /* * Create MSI w/ dummy vCPU set targeting just one vCPU, overwritten @@ -1370,7 +1370,6 @@ static u32 hv_compose_msi_req_v2( */ static void hv_compose_msi_msg(struct irq_data *data, struct msi_msg *msg) { - struct irq_cfg *cfg = irqd_cfg(data); struct hv_pcibus_device *hbus; struct vmbus_channel *channel; struct hv_pci_dev *hpdev; @@ -1420,7 +1419,7 @@ static void hv_compose_msi_msg(struct irq_data *data, struct msi_msg *msg) size = hv_compose_msi_req_v1(&ctxt.int_pkts.v1, dest, hpdev->desc.win_slot.slot, - cfg->vector); + hv_msi_get_int_vector(data)); break; case PCI_PROTOCOL_VERSION_1_2: @@ -1428,7 +1427,7 @@ static void hv_compose_msi_msg(struct irq_data *data, struct msi_msg *msg) size = hv_compose_msi_req_v2(&ctxt.int_pkts.v2, dest, hpdev->desc.win_slot.slot, - cfg->vector); + hv_msi_get_int_vector(data)); break; default: @@ -1544,7 +1543,7 @@ static struct irq_chip hv_msi_irq_chip = { }; static struct msi_domain_ops hv_msi_ops = { - .msi_prepare = pci_msi_prepare, + .msi_prepare = hv_msi_prepare, .msi_free = hv_msi_free, }; @@ -1563,17 +1562,26 @@ static struct msi_domain_ops hv_msi_ops = { */ static int hv_pcie_init_irq_domain(struct hv_pcibus_device *hbus) { + struct irq_domain *parent_domain; + + parent_domain = hv_msi_parent_vector_domain(); + if (!parent_domain) { + dev_err(&hbus->hdev->device, + "Failed to get parent MSI domain\n"); + return -ENODEV; + } + hbus->msi_info.chip = &hv_msi_irq_chip; hbus->msi_info.ops = &hv_msi_ops; hbus->msi_info.flags = (MSI_FLAG_USE_DEF_DOM_OPS | MSI_FLAG_USE_DEF_CHIP_OPS | MSI_FLAG_MULTI_PCI_MSI | MSI_FLAG_PCI_MSIX); - hbus->msi_info.handler = handle_edge_irq; - hbus->msi_info.handler_name = "edge"; + hbus->msi_info.handler = hv_msi_handler; + hbus->msi_info.handler_name = hv_msi_handler_name; hbus->msi_info.data = hbus; hbus->irq_domain = pci_msi_create_irq_domain(hbus->fwnode, &hbus->msi_info, - x86_vector_domain); + parent_domain); if (!hbus->irq_domain) { dev_err(&hbus->hdev->device, "Failed to build an MSI IRQ domain\n"); @@ -3478,9 +3486,15 @@ static void __exit exit_hv_pci_drv(void) static int __init init_hv_pci_drv(void) { + int ret; + if (!hv_is_hyperv_initialized()) return -ENODEV; + ret = hv_pci_arch_init(); + if (ret) + return ret; + /* Set the invalid domain number's bit, so it will not be used */ set_bit(HVPCI_DOM_INVALID, hvpci_dom_map); diff --git a/include/asm-generic/hyperv-tlfs.h b/include/asm-generic/hyperv-tlfs.h index 56348a541c50..45cc0c3b8ed7 100644 --- a/include/asm-generic/hyperv-tlfs.h +++ b/include/asm-generic/hyperv-tlfs.h @@ -539,39 +539,6 @@ enum hv_interrupt_source { HV_INTERRUPT_SOURCE_IOAPIC, }; -union hv_msi_address_register { - u32 as_uint32; - struct { - u32 reserved1:2; - u32 destination_mode:1; - u32 redirection_hint:1; - u32 reserved2:8; - u32 destination_id:8; - u32 msi_base:12; - }; -} __packed; - -union hv_msi_data_register { - u32 as_uint32; - struct { - u32 vector:8; - u32 delivery_mode:3; - u32 reserved1:3; - u32 level_assert:1; - u32 trigger_mode:1; - u32 reserved2:16; - }; -} __packed; - -/* HvRetargetDeviceInterrupt hypercall */ -union hv_msi_entry { - u64 as_uint64; - struct { - union hv_msi_address_register address; - union hv_msi_data_register data; - } __packed; -}; - union hv_ioapic_rte { u64 as_uint64;