From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BBD7CC004D3 for ; Wed, 24 Oct 2018 09:01:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8A215207DD for ; Wed, 24 Oct 2018 09:01:57 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8A215207DD Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=zte.com.cn Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728024AbeJXR3L (ORCPT ); Wed, 24 Oct 2018 13:29:11 -0400 Received: from out1.zte.com.cn ([202.103.147.172]:53448 "EHLO mxct.zte.com.cn" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727658AbeJXR3J (ORCPT ); Wed, 24 Oct 2018 13:29:09 -0400 Received: from mse01.zte.com.cn (unknown [10.30.3.20]) by Forcepoint Email with ESMTPS id 08A39D039164EE573B8E; Wed, 24 Oct 2018 17:01:51 +0800 (CST) Received: from notes_smtp.zte.com.cn ([10.30.1.239]) by mse01.zte.com.cn with ESMTP id w9O91D3F009095; Wed, 24 Oct 2018 17:01:13 +0800 (GMT-8) (envelope-from peng.hao2@zte.com.cn) Received: from localhost.localdomain.localdomain ([10.74.120.59]) by szsmtp06.zte.com.cn (Lotus Domino Release 8.5.3FP6) with ESMTP id 2018102417013533-6460473 ; Wed, 24 Oct 2018 17:01:35 +0800 From: Peng Hao To: robh+dt@kernel.org, mark.rutland@arm.com, arnd@arndb.de, gregkh@linuxfoundation.org, andy@infradead.org, dvhart@infradead.org Cc: linux-kernel@vger.kernel.org, platform-driver-x86@vger.kernel.org, hutao@cn.fujitsu.com, Peng Hao Subject: [PATCH V2 2/4] misc/pvpanic: add MMIO support Date: Thu, 25 Oct 2018 01:12:14 +0800 Message-Id: <1540401136-78500-2-git-send-email-peng.hao2@zte.com.cn> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1540401136-78500-1-git-send-email-peng.hao2@zte.com.cn> References: <1540401136-78500-1-git-send-email-peng.hao2@zte.com.cn> X-MIMETrack: Itemize by SMTP Server on SZSMTP06/server/zte_ltd(Release 8.5.3FP6|November 21, 2013) at 2018-10-24 17:01:35, Serialize by Router on notes_smtp/zte_ltd(Release 9.0.1FP7|August 17, 2016) at 2018-10-24 17:01:05, Serialize complete at 2018-10-24 17:01:05 X-MAIL: mse01.zte.com.cn w9O91D3F009095 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On some architectures (e.g. arm64), it's preferable to use MMIO, since this can be used standalone. Add MMIO support to the pvpanic driver. Signed-off-by: Peng Hao --- drivers/misc/pvpanic.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/drivers/misc/pvpanic.c b/drivers/misc/pvpanic.c index fd86dab..bcfefdd 100644 --- a/drivers/misc/pvpanic.c +++ b/drivers/misc/pvpanic.c @@ -43,6 +43,8 @@ static u16 port; +static void __iomem *base; + static struct acpi_driver pvpanic_driver = { .name = "pvpanic", .class = "QEMU", @@ -57,7 +59,10 @@ static void pvpanic_send_event(unsigned int event) { - outb(event, port); + if (port) + outb(event, port); + else if (base) + writeb(event, base); } static int @@ -77,6 +82,8 @@ static acpi_status pvpanic_walk_resources(struct acpi_resource *res, void *context) { + struct acpi_resource_fixed_memory32 *fixmem32; + switch (res->type) { case ACPI_RESOURCE_TYPE_END_TAG: return AE_OK; @@ -85,6 +92,11 @@ port = res->data.io.minimum; return AE_OK; + case ACPI_RESOURCE_TYPE_FIXED_MEMORY32: + fixmem32 = &res->data.fixed_memory32; + base = ioremap(fixmem32->address, fixmem32->address_length); + return AE_OK; + default: return AE_ERROR; } @@ -104,7 +116,7 @@ static int pvpanic_add(struct acpi_device *device) acpi_walk_resources(device->handle, METHOD_NAME__CRS, pvpanic_walk_resources, NULL); - if (!port) + if (!port && !base) return -ENODEV; atomic_notifier_chain_register(&panic_notifier_list, @@ -118,6 +130,8 @@ static int pvpanic_remove(struct acpi_device *device) atomic_notifier_chain_unregister(&panic_notifier_list, &pvpanic_panic_nb); + if (base) + iounmap(base); return 0; } -- 1.8.3.1