From patchwork Fri Dec 21 16:03:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Palmer Dabbelt X-Patchwork-Id: 10740673 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id AF70714DE for ; Fri, 21 Dec 2018 16:10:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9DF752848B for ; Fri, 21 Dec 2018 16:10:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9207F284B5; Fri, 21 Dec 2018 16:10:50 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 3D68C2848B for ; Fri, 21 Dec 2018 16:10:50 +0000 (UTC) Received: from localhost ([::1]:46454 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gaNNx-0008FW-DH for patchwork-qemu-devel@patchwork.kernel.org; Fri, 21 Dec 2018 11:10:49 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52994) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gaNHO-0001ey-GO for qemu-devel@nongnu.org; Fri, 21 Dec 2018 11:04:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gaNHN-0004E9-2m for qemu-devel@nongnu.org; Fri, 21 Dec 2018 11:04:02 -0500 Received: from mail-qt1-x82e.google.com ([2607:f8b0:4864:20::82e]:44404) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gaNHM-00049W-Of for qemu-devel@nongnu.org; Fri, 21 Dec 2018 11:04:00 -0500 Received: by mail-qt1-x82e.google.com with SMTP id n32so6161846qte.11 for ; Fri, 21 Dec 2018 08:03:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; h=subject:date:message-id:in-reply-to:references:cc:from:to; bh=B2OUXWtoyq20lymvhtwIjTpztHbwOwadgrVPRgraXAk=; b=lG34oRwqV27QZVQFS62nVbGlLN0ilrNf5huiEmhG5MFwjXZ4q+ynDPZgsYtGhiX1u/ fuMuQ8kwZ4TkMv3NKJkgE+5nT2l+F4Xb3ZQ8SUQKFrroa3djwThYUhAHvgaRErWlwIFX B7tGHI4x6uVnXz+E3PKngWE797KFfzH9pt4xSR8GfGegOTtmc0mmAxjHl0BqhAzdqs9H n7Cv9iWj8sUgit03F2Z0I58WL7JMVCUtO6PmSDbRRmEWIuigyKojgQ2RaEssi7F+eTGY s7cZXioaCNTLHd+Lutmc+2/FBr8qp327r7tS3lk8XxjMXBezWqgNgvnfMap6Vmys8Y1C 5lNg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:date:message-id:in-reply-to:references :cc:from:to; bh=B2OUXWtoyq20lymvhtwIjTpztHbwOwadgrVPRgraXAk=; b=MsmB9/JEgH6Q+Ad8c7YcuXrbNsP8yQO2LURr9l6KMv5CPtpKdn8R+RZXlSB50ac07e ayX8yuXgoWCF6O+/255t4R9LTYjqFIo7aGSRk+PfNvY18RDIK6mRsNkCcpxX6qEVAHQs pvYSIJ4RaxE8QFEN01tCYdlSJNOcW22hKdX3utWVm/P+/FL6luR2EyTwLEadbIIaY+4t 0I1HlbjEbG0zxMTeG6kNtxLQ5Bq/a4c/M4UZHe6ChjjElPuo1Ho7g7uMaCJMcfGP88s9 0fh+KDMN7D05r3Eg7Rox/ntQoNooGf0S204cp33yGAb1uiho7UGhssEG6VxBOnMRug5O Q0+Q== X-Gm-Message-State: AJcUukeKV+XsF+1VBybhVj09ZKn6Ke7XSGbMTQlQVh9VSuSFWFUWRWc+ gLpwVof7Jkmnk8kOg7EaqlLBytW4EBU= X-Google-Smtp-Source: ALg8bN5Q3O/fiRe0kBnCr/To/hMFbh2JU1tZ1C5ERE/+Je9/ikmlJCtiGrgrocWiVMNgd1H+ulgP6A== X-Received: by 2002:ac8:1185:: with SMTP id d5mr2998294qtj.117.1545408231238; Fri, 21 Dec 2018 08:03:51 -0800 (PST) Received: from localhost ([2601:182:c980:96c:8dd:4488:90b1:59d1]) by smtp.gmail.com with ESMTPSA id 83sm7520617qkz.73.2018.12.21.08.03.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 21 Dec 2018 08:03:50 -0800 (PST) Date: Fri, 21 Dec 2018 08:03:03 -0800 Message-Id: <20181221160307.14819-11-palmer@sifive.com> X-Mailer: git-send-email 2.18.1 In-Reply-To: <20181221160307.14819-1-palmer@sifive.com> References: <20181221160307.14819-1-palmer@sifive.com> From: Palmer Dabbelt To: qemu-riscv@nongnu.org X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::82e Subject: [Qemu-devel] [PULL 10/14] RISC-V: Enable second UART on sifive_e and sifive_u X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sagar Karandikar , Bastian Koppelmann , Palmer Dabbelt , qemu-devel@nongnu.org, Michael Clark , Alistair Francis Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Michael Clark Previously the second UARTs on the sifive_e and sifive_u machines where disabled due to check-qtest-riscv32 and check-qtest-riscv64 failures. Recent changes in the QEMU core serial code have resolved these failures so the second UARTs can be instantiated. Cc: Palmer Dabbelt Cc: Sagar Karandikar Cc: Bastian Koppelmann Cc: Alistair Francis Signed-off-by: Michael Clark Reviewed-by: Alistair Francis Signed-off-by: Alistair Francis Signed-off-by: Palmer Dabbelt --- hw/riscv/sifive_e.c | 5 ++--- hw/riscv/sifive_u.c | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/hw/riscv/sifive_e.c b/hw/riscv/sifive_e.c index cb513cc3bb50..5d9d65ff29ab 100644 --- a/hw/riscv/sifive_e.c +++ b/hw/riscv/sifive_e.c @@ -192,9 +192,8 @@ static void riscv_sifive_e_soc_realize(DeviceState *dev, Error **errp) memmap[SIFIVE_E_QSPI0].base, memmap[SIFIVE_E_QSPI0].size); sifive_mmio_emulate(sys_mem, "riscv.sifive.e.pwm0", memmap[SIFIVE_E_PWM0].base, memmap[SIFIVE_E_PWM0].size); - /* sifive_uart_create(sys_mem, memmap[SIFIVE_E_UART1].base, - serial_hd(1), qdev_get_gpio_in(DEVICE(s->plic), - SIFIVE_E_UART1_IRQ)); */ + sifive_uart_create(sys_mem, memmap[SIFIVE_E_UART1].base, + serial_hd(1), qdev_get_gpio_in(DEVICE(s->plic), SIFIVE_E_UART1_IRQ)); sifive_mmio_emulate(sys_mem, "riscv.sifive.e.qspi1", memmap[SIFIVE_E_QSPI1].base, memmap[SIFIVE_E_QSPI1].size); sifive_mmio_emulate(sys_mem, "riscv.sifive.e.pwm1", diff --git a/hw/riscv/sifive_u.c b/hw/riscv/sifive_u.c index 849fa2e6311a..3bd3b67507f8 100644 --- a/hw/riscv/sifive_u.c +++ b/hw/riscv/sifive_u.c @@ -368,9 +368,8 @@ static void riscv_sifive_u_soc_realize(DeviceState *dev, Error **errp) memmap[SIFIVE_U_PLIC].size); sifive_uart_create(system_memory, memmap[SIFIVE_U_UART0].base, serial_hd(0), qdev_get_gpio_in(DEVICE(s->plic), SIFIVE_U_UART0_IRQ)); - /* sifive_uart_create(system_memory, memmap[SIFIVE_U_UART1].base, - serial_hd(1), qdev_get_gpio_in(DEVICE(s->plic), - SIFIVE_U_UART1_IRQ)); */ + sifive_uart_create(system_memory, memmap[SIFIVE_U_UART1].base, + serial_hd(1), qdev_get_gpio_in(DEVICE(s->plic), SIFIVE_U_UART1_IRQ)); sifive_clint_create(memmap[SIFIVE_U_CLINT].base, memmap[SIFIVE_U_CLINT].size, smp_cpus, SIFIVE_SIP_BASE, SIFIVE_TIMECMP_BASE, SIFIVE_TIME_BASE);