From patchwork Mon Jan 20 22:00:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 1226132 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amsat.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=PFK9VGsr; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 481lyY1x7Pz9sRG for ; Tue, 21 Jan 2020 09:02:29 +1100 (AEDT) Received: from localhost ([::1]:44576 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1itf7p-0001Xx-Vr for incoming@patchwork.ozlabs.org; Mon, 20 Jan 2020 17:02:26 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50961) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1itf6h-0001Vr-NF for qemu-devel@nongnu.org; Mon, 20 Jan 2020 17:01:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1itf6f-0005m6-Tp for qemu-devel@nongnu.org; Mon, 20 Jan 2020 17:01:15 -0500 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:35663) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1itf6f-0005ji-NT for qemu-devel@nongnu.org; Mon, 20 Jan 2020 17:01:13 -0500 Received: by mail-wr1-x444.google.com with SMTP id g17so1132047wro.2 for ; Mon, 20 Jan 2020 14:01:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/1VSe/7St+k6/MQRetjcnD35mCiVVbYYdodJto6H7yU=; b=PFK9VGsrdI27BvomgI27b7fqRGifADuRdpF67qcU07bomcuWDsOLRrBoIQHPSgnCxZ NqZCcPnTbFTFD8x84k3rR2d1feCthc0O65J8wil0C4cO0MqWwf7WgxihwZg38mRO8K4X 6t2BZqvmSN4a3OumZ10521OW5Iwcs867RPtvKty44ndJxmYFO4Dr4Gtg1bzQyhrq7392 xEMIVNAolpT9+iTRMEUuHbYEOsoY84vSQEHbIfhI7QFJYuP+CL5QC5B0rjG5craxvUXp 7jKmSdFU98t4Zy/srOvqSIi0162ma0CkR4Vxg7Q7R8L2jlje0ZJs4MVQsU62L/22K3cY h0Cg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=/1VSe/7St+k6/MQRetjcnD35mCiVVbYYdodJto6H7yU=; b=eb8spv2upe7106WNCk24gXgNaWQEyOvpIKJ6krTHRkFzsQ/HpwM5qTxJBnsPGYCugB rw00G97q5Ss4qY3NmYBPKuHx/9iTRr4OuWITnPOXsgPqR++PL8O/SEWwXSs/O5/vJpo0 2ulN7vupjiZ1ARevdPam8vHWAUaAJV3ujLDDUIBcHf18wu4y/H/RWNIxn5IuErdBFgu2 t1CfdNZQVgRdDxwCtEUU6Jg66ObO5m8NpMFWcH/3ZuFtukwxRTmOsF5PlpFyOFhQC1zv tq1a2bb7n0ZAhdYOUs7dYljfqLXRie3TNKWgyz3fhe2EdPeXzPwFW7PGBlbZSfrN5ygM kuZA== X-Gm-Message-State: APjAAAW5uTacMN8OPBw4yVUaeePNQ4rPLAunh9rGGNleAxjvfngmQlZQ RAgaX0xA+4TSs9ScRQk9xG1TvRCP X-Google-Smtp-Source: APXvYqzAZO9Yyo2A4fnf315HSdCx+8IbysAoJa1DEg9hfxoj5Xf4dS4Wjwnr4aOoE6hkbypfcHs/RQ== X-Received: by 2002:a5d:43c7:: with SMTP id v7mr1493442wrr.32.1579557671802; Mon, 20 Jan 2020 14:01:11 -0800 (PST) Received: from x1w.redhat.com (113.red-83-57-172.dynamicip.rima-tde.net. [83.57.172.113]) by smtp.gmail.com with ESMTPSA id f1sm904341wmc.45.2020.01.20.14.01.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Jan 2020 14:01:11 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v4 02/18] MAINTAINERS: Move the AVR machines in new section (not within ARM) Date: Mon, 20 Jan 2020 23:00:51 +0100 Message-Id: <20200120220107.17825-3-f4bug@amsat.org> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200120220107.17825-1-f4bug@amsat.org> References: <20200120220107.17825-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::444 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sarah Harris , Michael Rolnik , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Aleksandar Markovic , Richard Henderson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Philippe Mathieu-Daudé --- !squash --- MAINTAINERS | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 3fbac64b31..4998fee99a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -489,19 +489,6 @@ F: hw/*/allwinner* F: include/hw/*/allwinner* F: hw/arm/cubieboard.c -AVR Machines -M: Michael Rolnik -R: Sarah Harris -S: Maintained -F: hw/avr/ -F: hw/char/avr_usart.c -F: include/hw/char/avr_usart.h -F: hw/timer/avr_timer16.c -F: include/hw/timer/avr_timer16.h -F: hw/misc/avr_mask.c -F: include/hw/misc/avr_mask.h -F: tests/acceptance/machine_avr6.py - ARM PrimeCell and CMSDK devices M: Peter Maydell L: qemu-arm@nongnu.org @@ -901,6 +888,22 @@ F: include/hw/*/nrf51*.h F: include/hw/*/microbit*.h F: tests/qtest/microbit-test.c +AVR Machines +------------- + +Atmel MCU +M: Michael Rolnik +R: Sarah Harris +S: Maintained +F: hw/avr/ +F: hw/char/avr_usart.c +F: include/hw/char/avr_usart.h +F: hw/timer/avr_timer16.c +F: include/hw/timer/avr_timer16.h +F: hw/misc/avr_mask.c +F: include/hw/misc/avr_mask.h +F: tests/acceptance/machine_avr6.py + CRIS Machines ------------- Axis Dev88 From patchwork Mon Jan 20 22:00:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 1226134 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amsat.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=V5Zxqh5t; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 481lyX5YwLz9sR8 for ; Tue, 21 Jan 2020 09:02:28 +1100 (AEDT) Received: from localhost ([::1]:44578 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1itf7p-0001YJ-MW for incoming@patchwork.ozlabs.org; Mon, 20 Jan 2020 17:02:25 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50974) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1itf6i-0001W8-Q2 for qemu-devel@nongnu.org; Mon, 20 Jan 2020 17:01:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1itf6h-0005mj-ML for qemu-devel@nongnu.org; Mon, 20 Jan 2020 17:01:16 -0500 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:41489) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1itf6g-0005ls-Jg for qemu-devel@nongnu.org; Mon, 20 Jan 2020 17:01:14 -0500 Received: by mail-wr1-x444.google.com with SMTP id c9so1087869wrw.8 for ; Mon, 20 Jan 2020 14:01:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ggNBufMgUXbLDI6GhLbTQ3tPRFEaGKDyzQZkuThquYg=; b=V5Zxqh5tOLKl2kwDGuL0MmWulWFWBaDYPPFV2jnIc68p6OzahXCGxJJ+1/+Bqw1Tpw pxSzO/O0W5MmZyHiKl0F2WoT2GUVv3fxP6mn6w2iMW00O/r24al2qvGJtLSrSZoQR5jZ X4nwee3CQW21suNJvW9sOOxeaF0LtmNrvzhHnM2GY6bxncbGJrJpQ+QRAR+VBGXsyFNT sld+rojEcpZKfPG6/tfYyvHENxMl2/Dqz5HCbji3TnGltq/cQSVTBRG1JxRAY7OCOMAZ 32oqHwECzPGjCFrLL/1lf+SYtkwB1G+oj0vl3OlaLXE/yWJqia26nsPpu4mqoMGzBArL UpEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=ggNBufMgUXbLDI6GhLbTQ3tPRFEaGKDyzQZkuThquYg=; b=LIXq3bh/OfUBpw3rfjsN+DpdpXEEByiWlzFqE61IrVMVEMBKQBZAdpXcbjG39fgPM5 U9F55jXygLdYpC9QRZ3WtFlIzqhbvlHvw1MQC0ncAqqAzdBnC45lob/fZRpZmQIClAib qH6vgMQmWfqBBSPQhpa0McAv0/ue8xcY5uo+qvPCVfiuMR/q/fP6CUzdN6yvk0zq29sC EzDSVwAUtEj2gsDQBsLLKK3sw622SWhsuiN2vl2u4wOVUM5I95Ir83L18XJrRKQiq6m6 wdW/ta/A51gxwJXxym2LYwumiZDX/JdmrwcnLOrY9p28lbQFhD+OAO8MY+5Dwl8tqgGQ vzYg== X-Gm-Message-State: APjAAAVx8j2PXqZWvm7156U2T9h27sbTlUAXqppbYkAL1neqXAriP9yF +2qLuYteZ+MgQb0QAFt1ALdA50Ey X-Google-Smtp-Source: APXvYqxocXpd9c4zqJUQZdMJRzAGQh/dX6aXTGofs68r2mhGU3LD65ynBurtDTn9fvX72AtqffBD4w== X-Received: by 2002:adf:f18b:: with SMTP id h11mr1633760wro.56.1579557673162; Mon, 20 Jan 2020 14:01:13 -0800 (PST) Received: from x1w.redhat.com (113.red-83-57-172.dynamicip.rima-tde.net. [83.57.172.113]) by smtp.gmail.com with ESMTPSA id f1sm904341wmc.45.2020.01.20.14.01.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Jan 2020 14:01:12 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v4 03/18] tests/acceptance: Do not set the machine type manually Date: Mon, 20 Jan 2020 23:00:52 +0100 Message-Id: <20200120220107.17825-4-f4bug@amsat.org> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200120220107.17825-1-f4bug@amsat.org> References: <20200120220107.17825-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::444 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sarah Harris , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= , Michael Rolnik , Cleber Rosa , Aleksandar Markovic , Richard Henderson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Since commit ba21bde93 we don't need to set the machine type manually, the one set by the ":avocado: tags=machine" will be used. Suggested-by: Cleber Rosa Signed-off-by: Philippe Mathieu-Daudé --- tests/acceptance/machine_avr6.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/acceptance/machine_avr6.py b/tests/acceptance/machine_avr6.py index 43501b26a3..784c287d0b 100644 --- a/tests/acceptance/machine_avr6.py +++ b/tests/acceptance/machine_avr6.py @@ -41,7 +41,6 @@ class AVR6Machine(Test): rom_hash = '7eb521f511ca8f2622e0a3c5e8dd686efbb911d4' rom_path = self.fetch_asset(rom_url, asset_hash=rom_hash) - self.vm.set_machine('sample') self.vm.add_args('-bios', rom_path) self.vm.add_args('-nographic') self.vm.launch() From patchwork Mon Jan 20 22:00:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 1226136 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amsat.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=HnGw5uhw; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 481m2f3RWdz9sPK for ; Tue, 21 Jan 2020 09:06:02 +1100 (AEDT) Received: from localhost ([::1]:44612 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1itfBH-0005cE-Od for incoming@patchwork.ozlabs.org; Mon, 20 Jan 2020 17:05:59 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50987) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1itf6n-0001XN-3g for qemu-devel@nongnu.org; Mon, 20 Jan 2020 17:01:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1itf6i-0005nC-Pc for qemu-devel@nongnu.org; Mon, 20 Jan 2020 17:01:20 -0500 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:56021) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1itf6i-0005mY-5P for qemu-devel@nongnu.org; Mon, 20 Jan 2020 17:01:16 -0500 Received: by mail-wm1-x344.google.com with SMTP id q9so891230wmj.5 for ; Mon, 20 Jan 2020 14:01:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=PkfCQHlpqeDlUpgK51cDzilsCf35iQgQS4GdrZ/sDcM=; b=HnGw5uhwZEGZQgJLY+V0QAK9fz9/nIczneCMjPVrit+tJNyHXkR6DMEGRxLsd5uAoz 6niY3bNlqc6RL4/TDoCiE63VvAQhU7h3QjqgN25FKWvgOwT0qMDN1wiXcSrJBh0tDidz iuWkGWXLssDpKAWjO+5DqpUbQ6f+LqAY7dJFcSppGvZcMj1QZ0duUTfDN0dEsMIRKcQ1 QFfUnOMuHDM+ZyBaT/xMzfMfTv6tAT1UD4sGyraiuKe/MjY5anybjUp20Wq2qVEtBLKp I0FmAc/Ps7wSj53CrE5A4yk1gDKGYaIPChQL4TsJz0I+55E9oBfgrNNlQsVVytymrWF3 BtyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=PkfCQHlpqeDlUpgK51cDzilsCf35iQgQS4GdrZ/sDcM=; b=FEYu/Jr44ZwkFC+H/SJ+EXmNpPxgPp6zi2+/CMrt0qTLa6eytccpV4qukPuW4Pqjhs kSTXdEgUiP4UwwhxgLETPPYm8w82BszLJeg4mwKfroDxc/5e+BmjklelYghDG2Z/kqbq JXYFh2iRUbe6DWqPLF4BwJxnwF9B1BD0srkMi4205pXAuEo2llz63CbGcAkoBKWTj+bg A0noYg0Y3n+XeS2lkotHkR/uNfZp3WqQ+rclmXa6d40XZiBqItvBLW8hqN/CG+iNpWWv P2txTqTrMfF+0LIA0xo/S//nNEy0nAHoR85KiOXUQHkv8pvtdhLvir3eso5+ybEC3iis DQLA== X-Gm-Message-State: APjAAAWXqAV8z1faqCbFkAC6DfqMgLcCO6DXSqqG4pWBwHs8e4C2Du8M jwrCHRs47mJSQd/I7zIT+HgqzmCO X-Google-Smtp-Source: APXvYqyrENP9GLcyaOoN+D2tdMlp1pRm1Sz4ePLfYg9C8HcA1c+B9TkInYzYuprSIAVCscjRUs6Y8Q== X-Received: by 2002:a05:600c:cd:: with SMTP id u13mr853134wmm.24.1579557674755; Mon, 20 Jan 2020 14:01:14 -0800 (PST) Received: from x1w.redhat.com (113.red-83-57-172.dynamicip.rima-tde.net. [83.57.172.113]) by smtp.gmail.com with ESMTPSA id f1sm904341wmc.45.2020.01.20.14.01.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Jan 2020 14:01:14 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v4 04/18] tests/acceptance: Keep multilines comment consistent with other tests Date: Mon, 20 Jan 2020 23:00:53 +0100 Message-Id: <20200120220107.17825-5-f4bug@amsat.org> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200120220107.17825-1-f4bug@amsat.org> References: <20200120220107.17825-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::344 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sarah Harris , Michael Rolnik , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Aleksandar Markovic , Richard Henderson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Philippe Mathieu-Daudé --- note to maintainer: squash before merge? --- tests/acceptance/machine_avr6.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/tests/acceptance/machine_avr6.py b/tests/acceptance/machine_avr6.py index 784c287d0b..611f6a62a4 100644 --- a/tests/acceptance/machine_avr6.py +++ b/tests/acceptance/machine_avr6.py @@ -33,11 +33,9 @@ class AVR6Machine(Test): https://github.com/seharris/qemu-avr-tests/raw/master/free-rtos/Demo/AVR_ATMega2560_GCC/demo.elf constantly prints out 'ABCDEFGHIJKLMNOPQRSTUVWXABCDEFGHIJKLMNOPQRSTUVWX' """ - rom_url = 'https://github.com/seharris/qemu-avr-tests' - rom_sha1= '36c3e67b8755dcf37e06af6730ef5d477b8ed16d' - rom_url += '/raw/' - rom_url += rom_sha1 - rom_url += '/free-rtos/Demo/AVR_ATMega2560_GCC/demo.elf' + rom_url = ('https://github.com/seharris/qemu-avr-tests' + '/raw/36c3e67b8755dcf/free-rtos/Demo' + '/AVR_ATMega2560_GCC/demo.elf') rom_hash = '7eb521f511ca8f2622e0a3c5e8dd686efbb911d4' rom_path = self.fetch_asset(rom_url, asset_hash=rom_hash) From patchwork Mon Jan 20 22:00:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 1226137 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amsat.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=FeHUlVgt; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 481m2g1BZkz9sPJ for ; Tue, 21 Jan 2020 09:06:03 +1100 (AEDT) Received: from localhost ([::1]:44614 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1itfBI-0005db-20 for incoming@patchwork.ozlabs.org; Mon, 20 Jan 2020 17:06:00 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50999) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1itf6o-0001Z1-Hh for qemu-devel@nongnu.org; Mon, 20 Jan 2020 17:01:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1itf6n-0005q5-2s for qemu-devel@nongnu.org; Mon, 20 Jan 2020 17:01:22 -0500 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:36869) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1itf6j-0005nT-NX for qemu-devel@nongnu.org; Mon, 20 Jan 2020 17:01:21 -0500 Received: by mail-wm1-x342.google.com with SMTP id f129so933061wmf.2 for ; Mon, 20 Jan 2020 14:01:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=PgExqrTGwY7vrn4B1c+MG4krYS866xKGizW5SQhXiUI=; b=FeHUlVgt5lgtH4sYtv46yYy96b6RnMFqiCXToC4zAldQ6BDCp49Pcvcx3G4Zue8H3h 7qu5isu5R9hPYet1c0VW2TjvoJWeDYl9Tqdvtn00dNV8sBgZOsfZ0q2ehMLvZ4ZPmCUZ R8JKdl9wuCvqf1xkF6hZTZP7b2As5itfR7pmdiqS4nMVukIsdMMU0UkGymGZRWWGc9EF UsEDgoaoqYz8h5TKGiNWw+5FJE7DIf9vXYCSqxfZW6oA7hYiE4M51Ds82W2i5igSNNm2 6PZ0arLVbYURDLy94dNu1rBA61M5l5a/mnApSyk31lWKNXGnvHeWKXrvc4caujNkDGmU BhZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=PgExqrTGwY7vrn4B1c+MG4krYS866xKGizW5SQhXiUI=; b=QnC/PdYmnFP7HrmjUM6bUTpxdlCLi09AB3xpPx6iy+aZ0oa4oftlukmZysR5C4wE+1 T+pSUmUZXfq9eHOGb1YXfh984nB7ThQnWGnsPQN8/SzMSs5Y1pkSvbVKOAem18VC3SaN l6Xx9pizgRNGbBvnJOaL8nzCTepppiL7R7xrJh+n+E4iv7lAilMUpaPfJ08srD6lVhai QvguVPlT2bAsAJFHZ78rSCCY9GPEg0DivTc6GL6V6LyuJFTP18NlWVDCgW4x+WZihR+f CS9zcr7cay3Jm2AL4IArjjbhhHdhrHaSTuSc6xVDga3kZRBeOV2vzYRNL7LooNTzi2f5 pS6A== X-Gm-Message-State: APjAAAXhnd/WExDuiL/Z5vy8sH/eWZA/ryAhC8Avg6V5dKHH7rmXLDIR TfqPXh8GXEi/+uQQ8ODi+o2KfI84 X-Google-Smtp-Source: APXvYqzUe3C0CkyTNZj1F30dRNwV6ahcZe8bINEMUphMigVFNuGU1QtMkBFXeDaVbM0bunH+L0iilQ== X-Received: by 2002:a05:600c:2108:: with SMTP id u8mr833358wml.183.1579557676673; Mon, 20 Jan 2020 14:01:16 -0800 (PST) Received: from x1w.redhat.com (113.red-83-57-172.dynamicip.rima-tde.net. [83.57.172.113]) by smtp.gmail.com with ESMTPSA id f1sm904341wmc.45.2020.01.20.14.01.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Jan 2020 14:01:15 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v4 05/18] hw/char/avr: Reduce USART I/O size Date: Mon, 20 Jan 2020 23:00:54 +0100 Message-Id: <20200120220107.17825-6-f4bug@amsat.org> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200120220107.17825-1-f4bug@amsat.org> References: <20200120220107.17825-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::342 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sarah Harris , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= , Michael Rolnik , Paolo Bonzini , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Aleksandar Markovic , Richard Henderson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Per the datasheet the USART uses 7 consecutive 8-bit registers. Signed-off-by: Philippe Mathieu-Daudé --- hw/char/avr_usart.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/char/avr_usart.c b/hw/char/avr_usart.c index cb307fe23d..becdb87847 100644 --- a/hw/char/avr_usart.c +++ b/hw/char/avr_usart.c @@ -280,7 +280,7 @@ static void avr_usart_init(Object *obj) sysbus_init_irq(SYS_BUS_DEVICE(obj), &s->rxc_irq); sysbus_init_irq(SYS_BUS_DEVICE(obj), &s->dre_irq); sysbus_init_irq(SYS_BUS_DEVICE(obj), &s->txc_irq); - memory_region_init_io(&s->mmio, obj, &avr_usart_ops, s, TYPE_AVR_USART, 8); + memory_region_init_io(&s->mmio, obj, &avr_usart_ops, s, TYPE_AVR_USART, 7); sysbus_init_mmio(SYS_BUS_DEVICE(obj), &s->mmio); qdev_init_gpio_in(DEVICE(s), avr_usart_pr, 1); s->enabled = true; From patchwork Mon Jan 20 22:00:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 1226141 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amsat.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=BTdA5HCs; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 481m5t29r4z9sPK for ; Tue, 21 Jan 2020 09:08:50 +1100 (AEDT) Received: from localhost ([::1]:44648 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1itfDz-0001bG-G1 for incoming@patchwork.ozlabs.org; Mon, 20 Jan 2020 17:08:47 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:51032) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1itf6q-0001au-KC for qemu-devel@nongnu.org; Mon, 20 Jan 2020 17:01:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1itf6o-0005rg-N1 for qemu-devel@nongnu.org; Mon, 20 Jan 2020 17:01:24 -0500 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:54700) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1itf6o-0005pJ-3G for qemu-devel@nongnu.org; Mon, 20 Jan 2020 17:01:22 -0500 Received: by mail-wm1-x341.google.com with SMTP id b19so895367wmj.4 for ; Mon, 20 Jan 2020 14:01:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=KFlHsYD314AzFD5CqSiDjK4Q0Xckkln012an+E5d5po=; b=BTdA5HCsAjdY3W6kZaDCC8eVXhMfoqzR6bXvko8qunF4PRJTYV8dAxYFbW/p03kYzP yC8iR3weIp95Wb2FC/meU9RInlIJX0/pxsMj9MxvAzBW19VZZqvXUj1hZ5E9LsO8EapL QD5m4otVZ54dQM15gmBH9RDuhIkTsNLut+iu0omNQCv7iGwH5359X3ROqiubv8Qe6cqI KtD5NqJEtM5NcO7yWnxEOYN6dgVzjRqdufgbWT8ApIwwfLdXvylDaOUktpxfp0wIljK1 Wqt7BzAyqtOfR22WgHlp9m83AOzrxYe0yJjX+5mp9llfRvPe5FbIOnAQau7q4jKFOXim HKgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=KFlHsYD314AzFD5CqSiDjK4Q0Xckkln012an+E5d5po=; b=UL6od6rlJ4z9F+rMJ911Aa8+qFUnTwt6AERNvo81TCsuO32uRn721jr9/j4TTHzo6p 5bEY/VItS5ySMrQ3kRhzKrGHN657qqGhLbUsQoGDRWwWMXBk1IRJIfyPkhiOHXSVSX1f 07SHv7GLfGGWY53qiOAm4ou3dPD10vdCov5HLEMgJ1tTB/n++cmPen2XLVVtCaHyOjFR DKuVwWa86DFRKZaKUfHjRg5HrGf/OXkC8hEwuP7w9AoSv6vPx40B9Xe0uFmNS0Kz2BJh oitN0RUgsr58QhlE3js+VA5O/58h4gPuRccmm6Jaqu+3aNXsaoBOFIN/1Kj3HhYPdVSX YqaQ== X-Gm-Message-State: APjAAAWy6cykn5uD3QLD9O85RhEz7WBp4Y67h74rmc9Y6AT8pYDYenix U2lRxdD+MLz/lXZTqsPUvZoly21P X-Google-Smtp-Source: APXvYqxEJOk6i9I5V3EHHzsjoey36rQ+/Bps5Q7DwAsfgKYGI7Zgg9hHsqUQ9xJqTDHJwuGkmCtzLw== X-Received: by 2002:a7b:cf2d:: with SMTP id m13mr848200wmg.163.1579557677877; Mon, 20 Jan 2020 14:01:17 -0800 (PST) Received: from x1w.redhat.com (113.red-83-57-172.dynamicip.rima-tde.net. [83.57.172.113]) by smtp.gmail.com with ESMTPSA id f1sm904341wmc.45.2020.01.20.14.01.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Jan 2020 14:01:17 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v4 06/18] hw/timer/avr_timer16: Rename memory region debugging name Date: Mon, 20 Jan 2020 23:00:55 +0100 Message-Id: <20200120220107.17825-7-f4bug@amsat.org> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200120220107.17825-1-f4bug@amsat.org> References: <20200120220107.17825-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::341 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sarah Harris , Michael Rolnik , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Aleksandar Markovic , Richard Henderson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" This device expose 3 different I/O regions. Name them differently to have a clearer 'info mtree' output. Signed-off-by: Philippe Mathieu-Daudé --- hw/timer/avr_timer16.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/timer/avr_timer16.c b/hw/timer/avr_timer16.c index aea1bf009e..a27933a18a 100644 --- a/hw/timer/avr_timer16.c +++ b/hw/timer/avr_timer16.c @@ -563,11 +563,11 @@ static void avr_timer16_init(Object *obj) sysbus_init_irq(SYS_BUS_DEVICE(obj), &s->ovf_irq); memory_region_init_io(&s->iomem, obj, &avr_timer16_ops, - s, TYPE_AVR_TIMER16, 0xe); + s, "avr-timer16", 0xe); memory_region_init_io(&s->imsk_iomem, obj, &avr_timer16_imsk_ops, - s, TYPE_AVR_TIMER16, 0x1); + s, "avr-timer16-intmask", 0x1); memory_region_init_io(&s->ifr_iomem, obj, &avr_timer16_ifr_ops, - s, TYPE_AVR_TIMER16, 0x1); + s, "avr-timer16-intflag", 0x1); sysbus_init_mmio(SYS_BUS_DEVICE(obj), &s->iomem); sysbus_init_mmio(SYS_BUS_DEVICE(obj), &s->imsk_iomem); From patchwork Mon Jan 20 22:00:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 1226140 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amsat.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=eG4ATBNe; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 481m5t0ghzz9sPJ for ; Tue, 21 Jan 2020 09:08:50 +1100 (AEDT) Received: from localhost ([::1]:44652 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1itfDz-0001br-CL for incoming@patchwork.ozlabs.org; Mon, 20 Jan 2020 17:08:47 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:51033) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1itf6q-0001av-J2 for qemu-devel@nongnu.org; Mon, 20 Jan 2020 17:01:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1itf6o-0005rc-Mi for qemu-devel@nongnu.org; Mon, 20 Jan 2020 17:01:24 -0500 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]:37458) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1itf6o-0005pc-3t for qemu-devel@nongnu.org; Mon, 20 Jan 2020 17:01:22 -0500 Received: by mail-wm1-x336.google.com with SMTP id f129so933183wmf.2 for ; Mon, 20 Jan 2020 14:01:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2ghWaCjCti0TY76Vco8TfPl0YwPAyikexg28ipljmVM=; b=eG4ATBNesK65nVRXR0PUrHjpelQPk6NvSzOWnWvDEtnXrRQ8bontwzvc1ZiEfNsm+S +jfhqqMeI7rzL2CtivvmaWC3odD++zjUATkf0ZIwQf3Gk50jfhkk8/Eb7XalP11h9+GC 8VVBXkvhFbpzfQud1OdkmXS/j1TyMXfZPR2JCjRnad1B3aBlTiT6qd8sWtf/o8nZhzVi 0eTG2+RCMDH+kSpkluLTMqU4XTiQfgMgpubkJr2qmqjq13ooBNBejHfFIUGowjmB350i O+31Z3+CUhoV3+3zxBW2CR/gxmq7TpODSSIEP9sLuNuBitfqvrwcUKvgsDA6XYNjgf9j qgdw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=2ghWaCjCti0TY76Vco8TfPl0YwPAyikexg28ipljmVM=; b=az6WCYf+T7vip9ixA3SO3SdSAJrcnvrn36egGlCBX3+ZjeHm23QDRKkDxLv1Aia8UA knTshNq1pS7gpHgRAhetkg0eY5SuhXfO8U5UVUw5Xk8qZg+1HwQrNdVHMWendvX+ZGb2 FmygI/Ro/Fv5sT/Og3C/ssGEcdot9VJ679vn2zffYMRTyX1k5+c9xL/3fBtrytKteDna N7Kn9OwFrTrRIcKWPK93UZJUPWjcjmmlkyrVRI8nw2Rq2hmthPMup6k/MnA2BElOc1Ez NB7JaCzMkAP/DUpUqKFDPCunM1pG0OJ787E+9K8Xwbq0WxX/sfC5LRDIEN3yo8LVBNfX lhSg== X-Gm-Message-State: APjAAAWbYhzCwKYKhhgDvQ+6P1BsI1D5PUGDMyefhzjYs4hIZoJDXTYj O8Bf3z67mUo3JBw5dPCCd6bAVECW X-Google-Smtp-Source: APXvYqyIOzAuDj5wUROQWgQWQIF48khrRUMGJfOxU/C/Cwi5NpAFH+meIkhPOCcWs+31WYdnP6FvqQ== X-Received: by 2002:a1c:2786:: with SMTP id n128mr812621wmn.47.1579557679264; Mon, 20 Jan 2020 14:01:19 -0800 (PST) Received: from x1w.redhat.com (113.red-83-57-172.dynamicip.rima-tde.net. [83.57.172.113]) by smtp.gmail.com with ESMTPSA id f1sm904341wmc.45.2020.01.20.14.01.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Jan 2020 14:01:18 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v4 07/18] hw/misc/avr_mask: Remove unused include Date: Mon, 20 Jan 2020 23:00:56 +0100 Message-Id: <20200120220107.17825-8-f4bug@amsat.org> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200120220107.17825-1-f4bug@amsat.org> References: <20200120220107.17825-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::336 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sarah Harris , Michael Rolnik , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Aleksandar Markovic , Richard Henderson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Philippe Mathieu-Daudé --- include/hw/misc/avr_mask.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/hw/misc/avr_mask.h b/include/hw/misc/avr_mask.h index d3e21972d8..5f95e1081d 100644 --- a/include/hw/misc/avr_mask.h +++ b/include/hw/misc/avr_mask.h @@ -26,7 +26,6 @@ #define HW_avr_mask_H #include "hw/sysbus.h" -#include "chardev/char-fe.h" #include "hw/hw.h" From patchwork Mon Jan 20 22:00:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 1226138 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amsat.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=BOSFdgzT; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 481m2j0LCZz9sPK for ; Tue, 21 Jan 2020 09:06:05 +1100 (AEDT) Received: from localhost ([::1]:44616 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1itfBK-0005hY-HZ for incoming@patchwork.ozlabs.org; Mon, 20 Jan 2020 17:06:02 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:51034) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1itf6q-0001ax-JA for qemu-devel@nongnu.org; Mon, 20 Jan 2020 17:01:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1itf6o-0005sA-UT for qemu-devel@nongnu.org; Mon, 20 Jan 2020 17:01:24 -0500 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:42364) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1itf6o-0005q1-Lf for qemu-devel@nongnu.org; Mon, 20 Jan 2020 17:01:22 -0500 Received: by mail-wr1-x442.google.com with SMTP id q6so1071008wro.9 for ; Mon, 20 Jan 2020 14:01:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=gRzGJF9eMfXheMVh+xvWRJn0J+YdP96rKAOtrxTRUN8=; b=BOSFdgzT3tXY8nl3rEcwu6O/AWUieNpiw2FJPLTPyZ0KxF6gaxW9PMN2tGzMZSu596 g30PNK/z+79I1L7L9dyBrxCtpXARYksyOW2ReFBicfHJZUIDQN7lIQwTZ002Nw/K8O1a yJ4iRWwqEJqfoBzLgPOElmDTczl0E+b3YNirZy2PGTPC3MaQBQ5Bpp9YJm8AQhSJesn1 bHg/vasPw+jvoB6d5W2TCpaDq3j9PDUNxXg2c06uYT8Ceowk9meVrZf1cQ2ZAW+TxCeX 9l//r9W602F3j87pZAm/fHuc7NrDKkSdMlLQFjultoc4BO3r3F84h6liyLLeuQJKaaQz +lQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=gRzGJF9eMfXheMVh+xvWRJn0J+YdP96rKAOtrxTRUN8=; b=RjeFENpQOopoWbq+RNDFKNfw09bI5Cgsi4356FKX6z+toP1HJAcayucV00iWxPCthR UbUBD/i4UdCRdUiJcCBOL2/VOpddNvzkxf1oU6SBwZP5/KHnY3l7zdf+Zr+kRm96Iu/W wcbo9uOd0Diw8ZkIjTBKwcoZv6tO36NTm2muo8PiTdotvungwM4vjVHISIrqMo7BEP52 CHSHX0q3HRsJmkcF9mJjmGk+lcKvuqwsx9naALvi589G/jbyAqawiCWxoG4WacGJCn8w q6o3i8Ec0Ktcjm/hc337i4FM8beHz7DLHVvy3Bk0nIJTQoKWJcfF4aObuTTj2YI0z+Tq xX+g== X-Gm-Message-State: APjAAAWPYhCWts+A8T5EVe3WvhfI8ht4IXa4sRilH1R+fetkG4WJ5hni dWD0lRBGJgT0L95lm78WyHBOtmda X-Google-Smtp-Source: APXvYqw2GQKGwn0IPZfdfWwG2DOq7tzbKjmNcmOH77Mr3rsWOg2TNL6UfnstVhB7+cplVWOT0N/qbg== X-Received: by 2002:a5d:4d4a:: with SMTP id a10mr1589154wru.220.1579557680498; Mon, 20 Jan 2020 14:01:20 -0800 (PST) Received: from x1w.redhat.com (113.red-83-57-172.dynamicip.rima-tde.net. [83.57.172.113]) by smtp.gmail.com with ESMTPSA id f1sm904341wmc.45.2020.01.20.14.01.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Jan 2020 14:01:19 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v4 08/18] hw/avr/Makefile: Use CONFIG_AVR_SAMPLE variable Date: Mon, 20 Jan 2020 23:00:57 +0100 Message-Id: <20200120220107.17825-9-f4bug@amsat.org> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200120220107.17825-1-f4bug@amsat.org> References: <20200120220107.17825-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::442 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sarah Harris , Michael Rolnik , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Aleksandar Markovic , Richard Henderson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Philippe Mathieu-Daudé --- hw/avr/Makefile.objs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/avr/Makefile.objs b/hw/avr/Makefile.objs index 626b7064b3..1eb4b53be6 100644 --- a/hw/avr/Makefile.objs +++ b/hw/avr/Makefile.objs @@ -1 +1 @@ -obj-y += sample.o +obj-$(CONFIG_AVR_SAMPLE) += sample.o From patchwork Mon Jan 20 22:00:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 1226142 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amsat.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=oaa+o8Ns; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 481m5v0K4Hz9sPJ for ; Tue, 21 Jan 2020 09:08:51 +1100 (AEDT) Received: from localhost ([::1]:44650 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1itfE0-0001bh-BM for incoming@patchwork.ozlabs.org; Mon, 20 Jan 2020 17:08:48 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:51062) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1itf6s-0001dL-IK for qemu-devel@nongnu.org; Mon, 20 Jan 2020 17:01:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1itf6q-0005u1-Me for qemu-devel@nongnu.org; Mon, 20 Jan 2020 17:01:26 -0500 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:43756) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1itf6q-0005rw-FJ for qemu-devel@nongnu.org; Mon, 20 Jan 2020 17:01:24 -0500 Received: by mail-wr1-x444.google.com with SMTP id d16so1073871wre.10 for ; Mon, 20 Jan 2020 14:01:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=UQvT/CeiP8OEft2xfUgYX9Y5aK54LLaIy+QVL2zdo+8=; b=oaa+o8Nswmhagm5864ATtzY2QJbB3+4IUQYShVvp2Wsr1R14h8pMAKYCFQte4NnJ/D 8vZRwn5GH7y5SxpC8n5UJuGL7FUyXvjmUNMoLsxysa8wWgi8Zx/7Sl+IJEm28gNS2zbs ISx90/TM+NxDsqfWeLV4y325/yltSEYtr1c51w6jpaLuZxIzNWhaHcdatXhammY9woFE THfzd83oocBAr1xWrmn0k8APDDo0B9XOvZOr7HpWQM8QafyXEfD/NJ5bkhTeu7PgpO27 SbjYD6Qh2wwg4Erq6hZwUfQFIglSDGhRoGfFD8hHd9eWKE0/cQKarQphCVPFcI/zggOB aRYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=UQvT/CeiP8OEft2xfUgYX9Y5aK54LLaIy+QVL2zdo+8=; b=KTCkkiTSxDoBhfd+vY12yAWDyHzDXxzb4o0EVCpYTxeMIzUkwuA22CIk1gemiZcJod huk8LEygJeEm4HHdsgZjT3p+xKbjNWfbL9jbDwQivg+2fzPnsdStKX/jTSkkEyj72Uba Jv0XVZTHjUritA/mP52ma2vD30J4cRtqrH9hpP7M+s2lfrHC1AxqymLSzgmMVNnxgsGX 6zfKIcPZ+4nMp6dDzdqYR0/V+iod7bRFp+eYNRyX94uhzFhNp8ylWAhIXhpgqc8RPxXx rmlfc5CNzODurLn4d7exlsscFsiWyNrYwxsLhVu1vD+zK1ujBMQqqgFOV8KahsBtB/z3 LePQ== X-Gm-Message-State: APjAAAVqJBiFhODEQq39wsoTxlzUHviXuBNaRn1+twqLE7pt9yTntNVN zL9ptTd1boaPI90YT43o/c2cQNOg X-Google-Smtp-Source: APXvYqwWkKG5iMqxgBUDwspeB/VIXbC+IqZloAHW8Joz2Oz4JhvrDl+MU16MgnK0Zr3M/lnCr1F43Q== X-Received: by 2002:adf:f411:: with SMTP id g17mr1433147wro.89.1579557682235; Mon, 20 Jan 2020 14:01:22 -0800 (PST) Received: from x1w.redhat.com (113.red-83-57-172.dynamicip.rima-tde.net. [83.57.172.113]) by smtp.gmail.com with ESMTPSA id f1sm904341wmc.45.2020.01.20.14.01.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Jan 2020 14:01:21 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v4 09/18] hw/char: Rename avr_usart -> atmel_usart Date: Mon, 20 Jan 2020 23:00:58 +0100 Message-Id: <20200120220107.17825-10-f4bug@amsat.org> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200120220107.17825-1-f4bug@amsat.org> References: <20200120220107.17825-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::444 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sarah Harris , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= , Michael Rolnik , Paolo Bonzini , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Aleksandar Markovic , Richard Henderson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" AVR is the architecture, Atmel the manufacturer. Suggested-by: Aleksandar Markovic Signed-off-by: Philippe Mathieu-Daudé --- !squash --- include/hw/char/{avr_usart.h => atmel_usart.h} | 10 +++++----- hw/avr/sample.c | 2 +- hw/char/{avr_usart.c => atmel_usart.c} | 4 ++-- MAINTAINERS | 4 ++-- hw/avr/Kconfig | 2 +- hw/char/Kconfig | 2 +- hw/char/Makefile.objs | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) rename include/hw/char/{avr_usart.h => atmel_usart.h} (93%) rename hw/char/{avr_usart.c => atmel_usart.c} (99%) diff --git a/include/hw/char/avr_usart.h b/include/hw/char/atmel_usart.h similarity index 93% rename from include/hw/char/avr_usart.h rename to include/hw/char/atmel_usart.h index 467e97e8c0..fd35feac60 100644 --- a/include/hw/char/avr_usart.h +++ b/include/hw/char/atmel_usart.h @@ -1,5 +1,5 @@ /* - * AVR USART + * Atmel AVR USART * * Copyright (c) 2018 University of Kent * Author: Sarah Harris @@ -19,8 +19,8 @@ * */ -#ifndef HW_AVR_USART_H -#define HW_AVR_USART_H +#ifndef HW_CHAR_ATMEL_USART_H +#define HW_CHAR_ATMEL_USART_H #include "hw/sysbus.h" #include "chardev/char-fe.h" @@ -56,7 +56,7 @@ #define USART_CSRC_CSZ1 (1 << 2) #define USART_CSRC_CSZ0 (1 << 1) -#define TYPE_AVR_USART "avr-usart" +#define TYPE_AVR_USART "atmel-usart" #define AVR_USART(obj) \ OBJECT_CHECK(AVRUsartState, (obj), TYPE_AVR_USART) @@ -90,4 +90,4 @@ typedef struct { qemu_irq dre_irq; } AVRUsartState; -#endif /* HW_AVR_USART_H */ +#endif /* HW_CHAR_ATMEL_USART_H */ diff --git a/hw/avr/sample.c b/hw/avr/sample.c index 95094a8d6c..ca67c11233 100644 --- a/hw/avr/sample.c +++ b/hw/avr/sample.c @@ -44,7 +44,7 @@ #include "qemu/error-report.h" #include "exec/address-spaces.h" #include "include/hw/sysbus.h" -#include "include/hw/char/avr_usart.h" +#include "include/hw/char/atmel_usart.h" #include "include/hw/timer/avr_timer16.h" #include "include/hw/misc/avr_mask.h" #include "elf.h" diff --git a/hw/char/avr_usart.c b/hw/char/atmel_usart.c similarity index 99% rename from hw/char/avr_usart.c rename to hw/char/atmel_usart.c index becdb87847..a7004c212a 100644 --- a/hw/char/avr_usart.c +++ b/hw/char/atmel_usart.c @@ -1,5 +1,5 @@ /* - * AVR USART + * Atmel AVR USART * * Copyright (c) 2018 University of Kent * Author: Sarah Harris @@ -20,7 +20,7 @@ */ #include "qemu/osdep.h" -#include "hw/char/avr_usart.h" +#include "hw/char/atmel_usart.h" #include "qemu/log.h" #include "hw/irq.h" #include "hw/qdev-properties.h" diff --git a/MAINTAINERS b/MAINTAINERS index 4998fee99a..f2e01a6d16 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -896,8 +896,8 @@ M: Michael Rolnik R: Sarah Harris S: Maintained F: hw/avr/ -F: hw/char/avr_usart.c -F: include/hw/char/avr_usart.h +F: hw/char/atmel_usart.c +F: include/hw/char/atmel_usart.h F: hw/timer/avr_timer16.c F: include/hw/timer/avr_timer16.h F: hw/misc/avr_mask.c diff --git a/hw/avr/Kconfig b/hw/avr/Kconfig index 92aa1e6afb..8084a73176 100644 --- a/hw/avr/Kconfig +++ b/hw/avr/Kconfig @@ -1,6 +1,6 @@ config AVR_SAMPLE bool select AVR_TIMER16 - select AVR_USART + select ATMEL_USART select AVR_MASK select UNIMP diff --git a/hw/char/Kconfig b/hw/char/Kconfig index 331b20983f..5a27681884 100644 --- a/hw/char/Kconfig +++ b/hw/char/Kconfig @@ -47,5 +47,5 @@ config SCLPCONSOLE config TERMINAL3270 bool -config AVR_USART +config ATMEL_USART bool diff --git a/hw/char/Makefile.objs b/hw/char/Makefile.objs index f05c1f5667..c23ad3b4a7 100644 --- a/hw/char/Makefile.objs +++ b/hw/char/Makefile.objs @@ -21,7 +21,7 @@ obj-$(CONFIG_PSERIES) += spapr_vty.o obj-$(CONFIG_DIGIC) += digic-uart.o obj-$(CONFIG_STM32F2XX_USART) += stm32f2xx_usart.o obj-$(CONFIG_RASPI) += bcm2835_aux.o -common-obj-$(CONFIG_AVR_USART) += avr_usart.o +common-obj-$(CONFIG_ATMEL_USART) += atmel_usart.o common-obj-$(CONFIG_CMSDK_APB_UART) += cmsdk-apb-uart.o common-obj-$(CONFIG_ETRAXFS) += etraxfs_ser.o From patchwork Mon Jan 20 22:00:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 1226145 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amsat.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=N4kCSdMd; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 481m962PgCz9s1x for ; Tue, 21 Jan 2020 09:11:38 +1100 (AEDT) Received: from localhost ([::1]:44688 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1itfGh-0005Jp-Nu for incoming@patchwork.ozlabs.org; Mon, 20 Jan 2020 17:11:35 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:51067) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1itf6s-0001dk-SG for qemu-devel@nongnu.org; Mon, 20 Jan 2020 17:01:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1itf6r-0005uH-3Y for qemu-devel@nongnu.org; Mon, 20 Jan 2020 17:01:26 -0500 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:38877) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1itf6q-0005tf-Sh for qemu-devel@nongnu.org; Mon, 20 Jan 2020 17:01:25 -0500 Received: by mail-wr1-x443.google.com with SMTP id y17so1109576wrh.5 for ; Mon, 20 Jan 2020 14:01:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=wgs2J2LLp4uuSA+tS75w8YGiE9cZF6FQc/75s2TfRGA=; b=N4kCSdMddrMC/P804ibycktGFEVTZ1fwAcYmW+mAqYmRgDwq4bjVmKNS6Fr9rXhWHI nnl+QpRhi2J0HEPonp9oqlse+lfpe4r/3CJahTjJEPHFBfZaIC7Zok1d9L0OchFnNiOK mYzXSY7f9+rF7ahDxNLWM6+JG7tWrJgVTu3no2cJuHI2rYzzfHU9EpYrjF+dy/1q4DCD PGHCEjyrWQvHHbICOPk35xBGSC4qJ85urm73Sq8FnT1vwVxVDo8/1PITQYmQWaaLSTsI I/NRZViTabFR7e+h8B1U0HRnw/mmHFEvAH6J7a0gIQOMfqkfJYNZ84I/QlSvEpp5ItI+ xzkQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=wgs2J2LLp4uuSA+tS75w8YGiE9cZF6FQc/75s2TfRGA=; b=HtipeBJ7m8kYO82Y9lK5f32ji7LrPHI1f7C+JekXidxrzJyh+2LTmZnGSv1ATx/sLc EhGMMxQD4BGYFbqXxDlcNNYIGMq4oqptmCCiRbDPE94xWb4AFIEPucn9bH6wRoJ/UVe/ 93MJxDQLnRaHnvd51VsMKhfKYx8aXrET3ARfPIRWusjqfwpUjZAmQBicB11fua7aYeSu 3xb1a7laOPPI8HFfh2c7OrrNTnbx4cUdxYDwlZp/821HQxFW7vXLud8o6q8qQLHRVC7m mmYxnDcmDvdkezgOQxlI8CBb7Ck6ephGtVMZcJfF0Bk0XfbNJVoDtGKdqFGBucG0TcH+ NX0w== X-Gm-Message-State: APjAAAV6N1+Uo20/GJAkUrOHYuDL0E/20I615SPcwTRLRB7Tx9A4l4jw iX52PoyEDriL7rJEfQx5bmzJgodE X-Google-Smtp-Source: APXvYqyVCAn4Jjn8eG8dGlFtuJ8BngGUry7m/TtUHMWDuXby01mOdd9SBDARXEC+W/SoAl1hz5ivug== X-Received: by 2002:a05:6000:118d:: with SMTP id g13mr1423782wrx.141.1579557683663; Mon, 20 Jan 2020 14:01:23 -0800 (PST) Received: from x1w.redhat.com (113.red-83-57-172.dynamicip.rima-tde.net. [83.57.172.113]) by smtp.gmail.com with ESMTPSA id f1sm904341wmc.45.2020.01.20.14.01.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Jan 2020 14:01:23 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v4 10/18] hw/timer: Rename avr_timer16 -> atmel_timer16 Date: Mon, 20 Jan 2020 23:00:59 +0100 Message-Id: <20200120220107.17825-11-f4bug@amsat.org> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200120220107.17825-1-f4bug@amsat.org> References: <20200120220107.17825-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::443 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sarah Harris , Michael Rolnik , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Aleksandar Markovic , Richard Henderson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" AVR is the architecture, Atmel the manufacturer. Suggested-by: Aleksandar Markovic Signed-off-by: Philippe Mathieu-Daudé --- !squash --- include/hw/timer/{avr_timer16.h => atmel_timer16.h} | 10 +++++----- hw/avr/sample.c | 2 +- hw/timer/{avr_timer16.c => atmel_timer16.c} | 4 ++-- MAINTAINERS | 4 ++-- hw/avr/Kconfig | 2 +- hw/timer/Kconfig | 2 +- hw/timer/Makefile.objs | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) rename include/hw/timer/{avr_timer16.h => atmel_timer16.h} (92%) rename hw/timer/{avr_timer16.c => atmel_timer16.c} (99%) diff --git a/include/hw/timer/avr_timer16.h b/include/hw/timer/atmel_timer16.h similarity index 92% rename from include/hw/timer/avr_timer16.h rename to include/hw/timer/atmel_timer16.h index 4ae0c64a34..f0516c41cf 100644 --- a/include/hw/timer/avr_timer16.h +++ b/include/hw/timer/atmel_timer16.h @@ -1,5 +1,5 @@ /* - * AVR 16 bit timer + * Atmel AVR 16 bit timer * * Copyright (c) 2018 University of Kent * Author: Ed Robbins @@ -25,8 +25,8 @@ * On ATmega640/V-1280/V-1281/V-2560/V-2561/V timers 1, 3, 4 and 5 are 16 bit */ -#ifndef AVR_TIMER16_H -#define AVR_TIMER16_H +#ifndef HW_TIMER_ATMEL_TIMER16_H +#define HW_TIMER_ATMEL_TIMER16_H #include "hw/sysbus.h" #include "qemu/timer.h" @@ -40,7 +40,7 @@ enum NextInterrupt { CAPT }; -#define TYPE_AVR_TIMER16 "avr-timer16" +#define TYPE_AVR_TIMER16 "atmel-timer16" #define AVR_TIMER16(obj) \ OBJECT_CHECK(AVRTimer16State, (obj), TYPE_AVR_TIMER16) @@ -91,4 +91,4 @@ typedef struct AVRTimer16State { enum NextInterrupt next_interrupt; } AVRTimer16State; -#endif /* AVR_TIMER16_H */ +#endif /* HW_TIMER_ATMEL_TIMER16_H */ diff --git a/hw/avr/sample.c b/hw/avr/sample.c index ca67c11233..19e9f56f3b 100644 --- a/hw/avr/sample.c +++ b/hw/avr/sample.c @@ -45,7 +45,7 @@ #include "exec/address-spaces.h" #include "include/hw/sysbus.h" #include "include/hw/char/atmel_usart.h" -#include "include/hw/timer/avr_timer16.h" +#include "include/hw/timer/atmel_timer16.h" #include "include/hw/misc/avr_mask.h" #include "elf.h" #include "hw/misc/unimp.h" diff --git a/hw/timer/avr_timer16.c b/hw/timer/atmel_timer16.c similarity index 99% rename from hw/timer/avr_timer16.c rename to hw/timer/atmel_timer16.c index a27933a18a..3b06d6e4e5 100644 --- a/hw/timer/avr_timer16.c +++ b/hw/timer/atmel_timer16.c @@ -1,5 +1,5 @@ /* - * AVR 16 bit timer + * Atmel AVR 16 bit timer * * Copyright (c) 2018 University of Kent * Author: Ed Robbins @@ -32,7 +32,7 @@ */ #include "qemu/osdep.h" -#include "hw/timer/avr_timer16.h" +#include "hw/timer/atmel_timer16.h" #include "qemu/log.h" #include "hw/irq.h" #include "hw/qdev-properties.h" diff --git a/MAINTAINERS b/MAINTAINERS index f2e01a6d16..a98d164bc1 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -898,8 +898,8 @@ S: Maintained F: hw/avr/ F: hw/char/atmel_usart.c F: include/hw/char/atmel_usart.h -F: hw/timer/avr_timer16.c -F: include/hw/timer/avr_timer16.h +F: hw/timer/atmel_timer16.c +F: include/hw/timer/atmel_timer16.h F: hw/misc/avr_mask.c F: include/hw/misc/avr_mask.h F: tests/acceptance/machine_avr6.py diff --git a/hw/avr/Kconfig b/hw/avr/Kconfig index 8084a73176..45c7025f09 100644 --- a/hw/avr/Kconfig +++ b/hw/avr/Kconfig @@ -1,6 +1,6 @@ config AVR_SAMPLE bool - select AVR_TIMER16 + select ATMEL_TIMER16 select ATMEL_USART select AVR_MASK select UNIMP diff --git a/hw/timer/Kconfig b/hw/timer/Kconfig index 2521056dc8..cc66b60ef1 100644 --- a/hw/timer/Kconfig +++ b/hw/timer/Kconfig @@ -36,5 +36,5 @@ config CMSDK_APB_DUALTIMER bool select PTIMER -config AVR_TIMER16 +config ATMEL_TIMER16 bool diff --git a/hw/timer/Makefile.objs b/hw/timer/Makefile.objs index af0913ca3b..08a8a5cee9 100644 --- a/hw/timer/Makefile.objs +++ b/hw/timer/Makefile.objs @@ -36,4 +36,4 @@ common-obj-$(CONFIG_CMSDK_APB_DUALTIMER) += cmsdk-apb-dualtimer.o common-obj-$(CONFIG_MSF2) += mss-timer.o common-obj-$(CONFIG_RASPI) += bcm2835_systmr.o -obj-$(CONFIG_AVR_TIMER16) += avr_timer16.o +obj-$(CONFIG_ATMEL_TIMER16) += atmel_timer16.o From patchwork Mon Jan 20 22:01:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 1226139 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amsat.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=B/yOlAbp; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 481m3m2JW1z9sR4 for ; Tue, 21 Jan 2020 09:07:00 +1100 (AEDT) Received: from localhost ([::1]:44632 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1itfCD-0007E2-EA for incoming@patchwork.ozlabs.org; Mon, 20 Jan 2020 17:06:57 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:51087) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1itf6t-0001fB-RN for qemu-devel@nongnu.org; Mon, 20 Jan 2020 17:01:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1itf6s-0005vH-Ei for qemu-devel@nongnu.org; Mon, 20 Jan 2020 17:01:27 -0500 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:46735) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1itf6s-0005ue-8a for qemu-devel@nongnu.org; Mon, 20 Jan 2020 17:01:26 -0500 Received: by mail-wr1-x442.google.com with SMTP id z7so1046137wrl.13 for ; Mon, 20 Jan 2020 14:01:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+NnvBu9orDWG1N7gHYUnC7PSiKSlzB6OsFAWh9OHuuI=; b=B/yOlAbpya950w4hDwRav24Kuu5/ovEVhJgwpLG4033HlWBcEcCXLigfZ23mvGsmLn fQvceftHFPol+3QyMmrIn8viqvtDZT06aiQwwF98mc/GLUftO5pZ0X8fQ5mrhCLvJVTe vknnul7YaldMUcz2bqq3etXcQY3O9a5zBImJRMbtfmdFXP4HS8QXNWvdXsNrpMWTptyN AazeE5M5sr5JAsNMM6CxjiZWlnEUQAa+YtupILYyHBAU+3VHZJaloZW/6nrcgnvgSXlX HLBJ1McxEQRwiFuusqYrtahBT9iSHImyy31XjrQvRUF4vUgORqMKscgxbCI7gL+X8u6o vn5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=+NnvBu9orDWG1N7gHYUnC7PSiKSlzB6OsFAWh9OHuuI=; b=EH98yfl3k6/rEgW8BBuqafv7IiqCBgjypuQAl18MGOnkA4nfT2LxqmbtF5CaJ5yUvQ SvMZbriL7EZ1cPkmVzZxgFTmwcbDa9HLgkTSi1CTHW2sTnrZcFcW0Qw/gCdf1JfNr0YB ZD7kfekuVg31q9u00lEjKf0zx39Pz8fOMb20wVD+sTVP6KaoKjbIpBDF/MsxhUPi6hu9 uOxxscuY84C4oieMuS1WWS8Q4KFve8WthatixCDDx/q4B9yXOBB1OmB2hNDvT3EmNMnY DicIpiy5tn/tTciCJU2IoScDdh23hV+uJZupx5jFha4Lc8oAz2cRGcO2HiUexlDHN3tm Mnsw== X-Gm-Message-State: APjAAAVU2yJ3G6vIeqosvz2Oxekh1gmNQBfH6innyrxinO035PcxHYdW 3F1OIZsXhlg/+PxgWL5dh405i+qA X-Google-Smtp-Source: APXvYqx9DHbVcMJX04dGQhygF68sNrinUKq8XskGWtp8cyszLS+v/0b8yC4AWGEgyMQRkWTxwoFu6Q== X-Received: by 2002:a5d:670a:: with SMTP id o10mr1466295wru.227.1579557685014; Mon, 20 Jan 2020 14:01:25 -0800 (PST) Received: from x1w.redhat.com (113.red-83-57-172.dynamicip.rima-tde.net. [83.57.172.113]) by smtp.gmail.com with ESMTPSA id f1sm904341wmc.45.2020.01.20.14.01.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Jan 2020 14:01:24 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v4 11/18] hw/misc: Rename avr_mask -> atmel_power Date: Mon, 20 Jan 2020 23:01:00 +0100 Message-Id: <20200120220107.17825-12-f4bug@amsat.org> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200120220107.17825-1-f4bug@amsat.org> References: <20200120220107.17825-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::442 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sarah Harris , Michael Rolnik , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Aleksandar Markovic , Richard Henderson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" AVR is the architecture, Atmel the manufacturer. Suggested-by: Aleksandar Markovic Signed-off-by: Philippe Mathieu-Daudé --- !squash --- include/hw/misc/{avr_mask.h => atmel_power.h} | 10 +++++----- hw/avr/sample.c | 2 +- hw/misc/{avr_mask.c => atmel_power.c} | 4 ++-- MAINTAINERS | 4 ++-- hw/avr/Kconfig | 2 +- hw/misc/Kconfig | 2 +- hw/misc/Makefile.objs | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) rename include/hw/misc/{avr_mask.h => atmel_power.h} (89%) rename hw/misc/{avr_mask.c => atmel_power.c} (97%) diff --git a/include/hw/misc/avr_mask.h b/include/hw/misc/atmel_power.h similarity index 89% rename from include/hw/misc/avr_mask.h rename to include/hw/misc/atmel_power.h index 5f95e1081d..5366e9693f 100644 --- a/include/hw/misc/avr_mask.h +++ b/include/hw/misc/atmel_power.h @@ -1,5 +1,5 @@ /* - * AVR Power Reduction + * Atmel AVR Power Reduction Management * * Copyright (c) 2019 Michael Rolnik * @@ -22,14 +22,14 @@ * THE SOFTWARE. */ -#ifndef HW_avr_mask_H -#define HW_avr_mask_H +#ifndef HW_MISC_ATMEL_POWER_H +#define HW_MISC_ATMEL_POWER_H #include "hw/sysbus.h" #include "hw/hw.h" -#define TYPE_AVR_MASK "avr-mask" +#define TYPE_AVR_MASK "atmel-power" #define AVR_MASK(obj) OBJECT_CHECK(AVRMaskState, (obj), TYPE_AVR_MASK) typedef struct { @@ -43,4 +43,4 @@ typedef struct { qemu_irq irq[8]; } AVRMaskState; -#endif /* HW_avr_mask_H */ +#endif /* HW_MISC_ATMEL_POWER_H */ diff --git a/hw/avr/sample.c b/hw/avr/sample.c index 19e9f56f3b..19b8c067e5 100644 --- a/hw/avr/sample.c +++ b/hw/avr/sample.c @@ -46,7 +46,7 @@ #include "include/hw/sysbus.h" #include "include/hw/char/atmel_usart.h" #include "include/hw/timer/atmel_timer16.h" -#include "include/hw/misc/avr_mask.h" +#include "include/hw/misc/atmel_power.h" #include "elf.h" #include "hw/misc/unimp.h" diff --git a/hw/misc/avr_mask.c b/hw/misc/atmel_power.c similarity index 97% rename from hw/misc/avr_mask.c rename to hw/misc/atmel_power.c index 3af82ed9c1..adab729f66 100644 --- a/hw/misc/avr_mask.c +++ b/hw/misc/atmel_power.c @@ -1,5 +1,5 @@ /* - * AVR Power Reduction + * Atmel AVR Power Reduction Management * * Copyright (c) 2019 Michael Rolnik * @@ -23,7 +23,7 @@ */ #include "qemu/osdep.h" -#include "hw/misc/avr_mask.h" +#include "hw/misc/atmel_power.h" #include "qemu/log.h" #include "hw/qdev-properties.h" #include "hw/irq.h" diff --git a/MAINTAINERS b/MAINTAINERS index a98d164bc1..60634cebf4 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -900,8 +900,8 @@ F: hw/char/atmel_usart.c F: include/hw/char/atmel_usart.h F: hw/timer/atmel_timer16.c F: include/hw/timer/atmel_timer16.h -F: hw/misc/avr_mask.c -F: include/hw/misc/avr_mask.h +F: hw/misc/atmel_power.c +F: include/hw/misc/atmel_power.h F: tests/acceptance/machine_avr6.py CRIS Machines diff --git a/hw/avr/Kconfig b/hw/avr/Kconfig index 45c7025f09..516b89c849 100644 --- a/hw/avr/Kconfig +++ b/hw/avr/Kconfig @@ -2,5 +2,5 @@ config AVR_SAMPLE bool select ATMEL_TIMER16 select ATMEL_USART - select AVR_MASK + select ATMEL_POWER select UNIMP diff --git a/hw/misc/Kconfig b/hw/misc/Kconfig index 74a1e9a241..3a3c32e1b0 100644 --- a/hw/misc/Kconfig +++ b/hw/misc/Kconfig @@ -131,7 +131,7 @@ config MAC_VIA select MOS6522 select ADB -config AVR_MASK +config ATMEL_POWER bool source macio/Kconfig diff --git a/hw/misc/Makefile.objs b/hw/misc/Makefile.objs index bbf17f651b..e605964f4b 100644 --- a/hw/misc/Makefile.objs +++ b/hw/misc/Makefile.objs @@ -86,4 +86,4 @@ obj-$(CONFIG_MAC_VIA) += mac_via.o common-obj-$(CONFIG_GRLIB) += grlib_ahb_apb_pnp.o -obj-$(CONFIG_AVR_MASK) += avr_mask.o +obj-$(CONFIG_ATMEL_POWER) += atmel_power.o From patchwork Mon Jan 20 22:01:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 1226146 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amsat.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=o9XLjQ6U; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 481m964vvQz9sR4 for ; Tue, 21 Jan 2020 09:11:38 +1100 (AEDT) Received: from localhost ([::1]:44686 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1itfGh-0005Ir-WB for incoming@patchwork.ozlabs.org; Mon, 20 Jan 2020 17:11:36 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:51095) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1itf6u-0001fs-Jh for qemu-devel@nongnu.org; Mon, 20 Jan 2020 17:01:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1itf6t-0005w1-HY for qemu-devel@nongnu.org; Mon, 20 Jan 2020 17:01:28 -0500 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:40434) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1itf6t-0005vd-BC for qemu-devel@nongnu.org; Mon, 20 Jan 2020 17:01:27 -0500 Received: by mail-wr1-x444.google.com with SMTP id c14so1088789wrn.7 for ; Mon, 20 Jan 2020 14:01:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=uF5SD4eExXYhrVbQuOpTQ8D9Fx28DI4wx6WvsKwahOc=; b=o9XLjQ6UNQ5vxcruZJ+Fsv+Zs/8lMjbiAFk8ooH70IcYrWKkoncJFwLa1Azab20M0d lGjStZG4OPqxFyRrw9fha+vrGRMlm8MURK+LMUmR74SGvsv+oICgHr5+A0Edt2iYzNlS ecEzC+UGVfBBagcqlm+MQe1yvSAM208qxCgcr6AgMlZUlHkSStRQMgZRv7XRha0Qpem7 7sjEpBndkBgcuVPTZgw8daMsanGwfXYG7mmyPAlj/+AiOZ9NIDG4ah2TgMMFhnx7Ieek Rxr6MLAlBm+vVCoWf4qqHe3l0GrbMFk+HocUCnj0zFd1qNqENmzRypA6impFXwInc5+3 9rxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=uF5SD4eExXYhrVbQuOpTQ8D9Fx28DI4wx6WvsKwahOc=; b=hYThn4L0WjiK6px2kf0qNOKasTMGAfJJ7n7Fg0KaIrMPyz6V10Xqs22jFOswncPvOe TnOxuKJXbEBoSuTNDWY/IA+plt9lMqUR7x7SaRUCsvhWQNzZASGdum96EVjNTSjQOTXo /Jv8I5keYVTUSkFGkMAhzS6+g+6WrKin7sULGQV2rh0xRYQzMEYYwmLBgDH+1UiC0dgu kpqZ6mRyO8z14zSZcBZHXiOqzjaj/Kw463WzBrylG3CrXyLdNnk905ET39kY5joiyFEf 7c9rOKpqzXACknGh7cEb9g8vEYhehhYlXRX5OWevzZrp9vCeA8DNbqr25Hf/La8KUc3R dbzg== X-Gm-Message-State: APjAAAUL0hj9bJXMNJayhMwKe5BFI3LrofZ76u8zR65aNN9oMCh1lVbD +hfMztvH9toFOBIldnnJ8kSWTTOp X-Google-Smtp-Source: APXvYqwTGXWRAeZ6rBbUb2PZkxurYoq4vpwYkGcwaZvdsSeYiNvkHb29BBLwmqfXjK4H5SNXIM9ttQ== X-Received: by 2002:adf:ed83:: with SMTP id c3mr1459094wro.51.1579557686288; Mon, 20 Jan 2020 14:01:26 -0800 (PST) Received: from x1w.redhat.com (113.red-83-57-172.dynamicip.rima-tde.net. [83.57.172.113]) by smtp.gmail.com with ESMTPSA id f1sm904341wmc.45.2020.01.20.14.01.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Jan 2020 14:01:25 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v4 12/18] hw/avr: Introduce ATMEL_ATMEGA_MCU config Date: Mon, 20 Jan 2020 23:01:01 +0100 Message-Id: <20200120220107.17825-13-f4bug@amsat.org> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200120220107.17825-1-f4bug@amsat.org> References: <20200120220107.17825-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::444 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sarah Harris , Michael Rolnik , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Aleksandar Markovic , Richard Henderson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Philippe Mathieu-Daudé --- hw/avr/Kconfig | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hw/avr/Kconfig b/hw/avr/Kconfig index 516b89c849..228eae7582 100644 --- a/hw/avr/Kconfig +++ b/hw/avr/Kconfig @@ -1,6 +1,9 @@ -config AVR_SAMPLE +config ATMEL_ATMEGA_MCU bool select ATMEL_TIMER16 select ATMEL_USART select ATMEL_POWER + +config AVR_SAMPLE + select ATMEL_ATMEGA_MCU select UNIMP From patchwork Mon Jan 20 22:01:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 1226151 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amsat.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=LwhIpOqx; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 481mDW1lzMz9sR0 for ; Tue, 21 Jan 2020 09:14:35 +1100 (AEDT) Received: from localhost ([::1]:44712 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1itfJY-0000oe-Ez for incoming@patchwork.ozlabs.org; Mon, 20 Jan 2020 17:14:32 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:51122) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1itf6y-0001lA-6z for qemu-devel@nongnu.org; Mon, 20 Jan 2020 17:01:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1itf6v-0005ww-C4 for qemu-devel@nongnu.org; Mon, 20 Jan 2020 17:01:31 -0500 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:44856) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1itf6v-0005wR-2D for qemu-devel@nongnu.org; Mon, 20 Jan 2020 17:01:29 -0500 Received: by mail-wr1-x435.google.com with SMTP id q10so1063741wrm.11 for ; Mon, 20 Jan 2020 14:01:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=bsuoFUagVUIPEgYGrbP32TS5kI+ibKfZD/pkwN/XwbM=; b=LwhIpOqxBmn3Ylu9gxI44ANiAZl+tLs8IjAIMFrEYTDWKNYBr1jGmpnI+/VS8luH/e ZGKylLmeG9l5DvJ5MbUx0wvKDSsk+d7RqbzDYnsC2fvcpt03BQjQ7jFXQ08H0FxIlKEf GLu3nKKJlzYQ8bi0g26JLWwfoDTZFtd7mY56iqZ2mU4c3lv1yki+wcmXyG68hqrW2TfQ cRevUQn0ywCtkjLrzILYkoGiuS/X7sY0Gh7TI+w7xQIpSt9BC8YMTxM29dkJmRPxBA2w sLNYkRbKKA0vbMSzP/JQvxjF+i4Syt0bJtTJa0WNpeMUGa4cNovJ1F+s4SpAQxZD2xBs 4yyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=bsuoFUagVUIPEgYGrbP32TS5kI+ibKfZD/pkwN/XwbM=; b=btR3t83RJ3BHWsVJ8YRKJDGFp1oOVsOOGTaf7lGpAkpHMlB79oKq80wQ/6drX0WqWB NPSmBYOQtTasMvpWR0OtDwKJVK7CVxN5gs8YIlooyVUE6JN+J8O3NH1tXzaqLT3EFd5l 6irvVG3qc334H1TbxeiPDxhY71jDCUeRyEOUX8+ErhkSMcYBWRYhhFFFX2yqCgQsRFit GPN54Ggz4Tk4TtCi5Ygoax3dPEQ5ItvU/SlpBGPvNdgmucrUG0qRw6uQ3MgMKERyemH9 hNBORw9FyDEckyuS7Z26A8MHJHrbrGZabhb5Jsb2nCGXtuO4kamhOSz1YG4b7nO8oAnc P24g== X-Gm-Message-State: APjAAAWQKFvn27Gx/t8TPB4976RWMb1qwemjjYmLoLNzURVpVqfITXjY Vn50Wm4SZaqF7qNHqo+ErLwIideo X-Google-Smtp-Source: APXvYqxA2wsrJJIVeyp5cvsk5DmJs5kdTFB0l4FFGYyL4GmcPGIILp6QVSwZKTh8uDkTLXGC4E0ilA== X-Received: by 2002:adf:e58b:: with SMTP id l11mr1499023wrm.402.1579557687636; Mon, 20 Jan 2020 14:01:27 -0800 (PST) Received: from x1w.redhat.com (113.red-83-57-172.dynamicip.rima-tde.net. [83.57.172.113]) by smtp.gmail.com with ESMTPSA id f1sm904341wmc.45.2020.01.20.14.01.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Jan 2020 14:01:26 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v4 13/18] hw/avr: Add some ATmega microcontrollers Date: Mon, 20 Jan 2020 23:01:02 +0100 Message-Id: <20200120220107.17825-14-f4bug@amsat.org> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200120220107.17825-1-f4bug@amsat.org> References: <20200120220107.17825-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::435 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sarah Harris , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= , Michael Rolnik , Igor Mammedov , Aleksandar Markovic , Richard Henderson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Add some microcontrollers from the megaAVR family (ATmega series): - middle range: ATmega168 and ATmega328 - high range: ATmega1280 and ATmega2560 For product comparison: https://www.microchip.com/wwwproducts/ProductCompare/ATmega168P/ATmega328P https://www.microchip.com/wwwproducts/ProductCompare/ATmega1280/ATmega2560 Datasheets: http://ww1.microchip.com/downloads/en/DeviceDoc/ATmega48A-PA-88A-PA-168A-PA-328-P-DS-DS40002061A.pdf http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-2549-8-bit-AVR-Microcontroller-ATmega640-1280-1281-2560-2561_datasheet.pdf Signed-off-by: Philippe Mathieu-Daudé --- v2: - Reword description adding more information (Aleksandar) - Use DEFINE_TYPES and memory_region_init_ram (Igor) Cc: Igor Mammedov --- hw/avr/atmel_atmega.h | 48 +++++ hw/avr/atmel_atmega.c | 464 ++++++++++++++++++++++++++++++++++++++++++ hw/avr/Makefile.objs | 1 + 3 files changed, 513 insertions(+) create mode 100644 hw/avr/atmel_atmega.h create mode 100644 hw/avr/atmel_atmega.c diff --git a/hw/avr/atmel_atmega.h b/hw/avr/atmel_atmega.h new file mode 100644 index 0000000000..391b8b1bf8 --- /dev/null +++ b/hw/avr/atmel_atmega.h @@ -0,0 +1,48 @@ +/* + * QEMU ATmega MCU + * + * Copyright (c) 2019 Philippe Mathieu-Daudé + * + * This work is licensed under the terms of the GNU GPLv2 or later. + * See the COPYING file in the top-level directory. + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#ifndef HW_AVR_ATMEL_ATMEGA_H +#define HW_AVR_ATMEL_ATMEGA_H + +#include "hw/char/atmel_usart.h" +#include "hw/timer/atmel_timer16.h" +#include "hw/misc/atmel_power.h" +#include "target/avr/cpu.h" + +#define TYPE_ATMEGA_MCU "ATmega" +#define TYPE_ATMEGA168_MCU "ATmega168" +#define TYPE_ATMEGA328_MCU "ATmega328" +#define TYPE_ATMEGA1280_MCU "ATmega1280" +#define TYPE_ATMEGA2560_MCU "ATmega2560" + +#define ATMEGA_MCU(obj) OBJECT_CHECK(AtmegaMcuState, (obj), TYPE_ATMEGA_MCU) + +#define POWER_MAX 2 +#define USART_MAX 4 +#define TIMER_MAX 6 +#define GPIO_MAX 12 + +typedef struct AtmegaMcuState { + /*< private >*/ + SysBusDevice parent_obj; + /*< public >*/ + + AVRCPU cpu; + MemoryRegion flash; + MemoryRegion eeprom; + MemoryRegion sram; + DeviceState *io; + AVRMaskState pwr[POWER_MAX]; + AVRUsartState usart[USART_MAX]; + AVRTimer16State timer[TIMER_MAX]; + uint64_t xtal_freq_hz; +} AtmegaMcuState; + +#endif /* HW_AVR_ATMEL_ATMEGA_H */ diff --git a/hw/avr/atmel_atmega.c b/hw/avr/atmel_atmega.c new file mode 100644 index 0000000000..18ab0b7906 --- /dev/null +++ b/hw/avr/atmel_atmega.c @@ -0,0 +1,464 @@ +/* + * QEMU ATmega MCU + * + * Copyright (c) 2019 Philippe Mathieu-Daudé + * + * This work is licensed under the terms of the GNU GPLv2 or later. + * See the COPYING file in the top-level directory. + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "qemu/osdep.h" +#include "qemu/module.h" +#include "qemu/units.h" +#include "qapi/error.h" +#include "exec/memory.h" +#include "exec/address-spaces.h" +#include "sysemu/sysemu.h" +#include "hw/qdev-properties.h" +#include "hw/sysbus.h" +#include "hw/boards.h" /* FIXME memory_region_allocate_system_memory for sram */ +#include "hw/misc/unimp.h" +#include "atmel_atmega.h" + +enum AtmegaPeripheral { + POWER0, POWER1, + GPIOA, GPIOB, GPIOC, GPIOD, GPIOE, GPIOF, + GPIOG, GPIOH, GPIOI, GPIOJ, GPIOK, GPIOL, + USART0, USART1, USART2, USART3, + TIMER0, TIMER1, TIMER2, TIMER3, TIMER4, TIMER5, + PERIFMAX +}; + +#define GPIO(n) (n + GPIOA) +#define USART(n) (n + USART0) +#define TIMER(n) (n + TIMER0) +#define POWER(n) (n + POWER0) + +typedef struct { + uint16_t addr; + enum AtmegaPeripheral power_index; + uint8_t power_bit; + /* timer specific */ + uint16_t intmask_addr; + uint16_t intflag_addr; + bool is_timer16; +} peripheral_cfg; + +typedef struct AtmegaMcuClass { + /*< private >*/ + SysBusDeviceClass parent_class; + /*< public >*/ + const char *uc_name; + const char *cpu_type; + size_t flash_size; + size_t eeprom_size; + size_t sram_size; + size_t io_size; + size_t gpio_count; + size_t adc_count; + const uint8_t *irq; + const peripheral_cfg *dev; +} AtmegaMcuClass; + +#define ATMEGA_MCU_CLASS(klass) \ + OBJECT_CLASS_CHECK(AtmegaMcuClass, (klass), TYPE_ATMEGA_MCU) +#define ATMEGA_MCU_GET_CLASS(obj) \ + OBJECT_GET_CLASS(AtmegaMcuClass, (obj), TYPE_ATMEGA_MCU) + +static const peripheral_cfg dev168_328[PERIFMAX] = { + [USART0] = { 0xc0, POWER0, 1 }, + [TIMER2] = { 0xb0, POWER0, 6, 0x70, 0x37, false }, + [TIMER1] = { 0x80, POWER0, 3, 0x6f, 0x36, true }, + [POWER0] = { 0x64 }, + [TIMER0] = { 0x44, POWER0, 5, 0x6e, 0x35, false }, + [GPIOD] = { 0x29 }, + [GPIOC] = { 0x26 }, + [GPIOB] = { 0x23 }, +}, dev1280_2560[PERIFMAX] = { + [USART3] = { 0x130, POWER1, 2 }, + [TIMER5] = { 0x120, POWER1, 5, 0x73, 0x3a, true }, + [GPIOL] = { 0x109 }, + [GPIOK] = { 0x106 }, + [GPIOJ] = { 0x103 }, + [GPIOH] = { 0x100 }, + [USART2] = { 0xd0, POWER1, 1 }, + [USART1] = { 0xc8, POWER1, 0 }, + [USART0] = { 0xc0, POWER0, 1 }, + [TIMER2] = { 0xb0, POWER0, 6, 0x70, 0x37, false }, /* TODO async */ + [TIMER4] = { 0xa0, POWER1, 4, 0x72, 0x39, true }, + [TIMER3] = { 0x90, POWER1, 3, 0x71, 0x38, true }, + [TIMER1] = { 0x80, POWER0, 3, 0x6f, 0x36, true }, + [POWER1] = { 0x65 }, + [POWER0] = { 0x64 }, + [TIMER0] = { 0x44, POWER0, 5, 0x6e, 0x35, false }, + [GPIOG] = { 0x32 }, + [GPIOF] = { 0x2f }, + [GPIOE] = { 0x2c }, + [GPIOD] = { 0x29 }, + [GPIOC] = { 0x26 }, + [GPIOB] = { 0x23 }, + [GPIOA] = { 0x20 }, +}; + +enum AtmegaIrq { + USART0_RXC_IRQ, USART0_DRE_IRQ, USART0_TXC_IRQ, + USART1_RXC_IRQ, USART1_DRE_IRQ, USART1_TXC_IRQ, + USART2_RXC_IRQ, USART2_DRE_IRQ, USART2_TXC_IRQ, + USART3_RXC_IRQ, USART3_DRE_IRQ, USART3_TXC_IRQ, + TIMER0_CAPT_IRQ, TIMER0_COMPA_IRQ, TIMER0_COMPB_IRQ, + TIMER0_COMPC_IRQ, TIMER0_OVF_IRQ, + TIMER1_CAPT_IRQ, TIMER1_COMPA_IRQ, TIMER1_COMPB_IRQ, + TIMER1_COMPC_IRQ, TIMER1_OVF_IRQ, + TIMER2_CAPT_IRQ, TIMER2_COMPA_IRQ, TIMER2_COMPB_IRQ, + TIMER2_COMPC_IRQ, TIMER2_OVF_IRQ, + TIMER3_CAPT_IRQ, TIMER3_COMPA_IRQ, TIMER3_COMPB_IRQ, + TIMER3_COMPC_IRQ, TIMER3_OVF_IRQ, + TIMER4_CAPT_IRQ, TIMER4_COMPA_IRQ, TIMER4_COMPB_IRQ, + TIMER4_COMPC_IRQ, TIMER4_OVF_IRQ, + TIMER5_CAPT_IRQ, TIMER5_COMPA_IRQ, TIMER5_COMPB_IRQ, + TIMER5_COMPC_IRQ, TIMER5_OVF_IRQ, + IRQ_COUNT +}; + +#define USART_IRQ_COUNT 3 +#define USART_RXC_IRQ(n) (n * USART_IRQ_COUNT + USART0_RXC_IRQ) +#define USART_DRE_IRQ(n) (n * USART_IRQ_COUNT + USART0_DRE_IRQ) +#define USART_TXC_IRQ(n) (n * USART_IRQ_COUNT + USART0_TXC_IRQ) +#define TIMER_IRQ_COUNT 5 +#define TIMER_CAPT_IRQ(n) (n * TIMER_IRQ_COUNT + TIMER0_CAPT_IRQ) +#define TIMER_COMPA_IRQ(n) (n * TIMER_IRQ_COUNT + TIMER0_COMPA_IRQ) +#define TIMER_COMPB_IRQ(n) (n * TIMER_IRQ_COUNT + TIMER0_COMPB_IRQ) +#define TIMER_COMPC_IRQ(n) (n * TIMER_IRQ_COUNT + TIMER0_COMPC_IRQ) +#define TIMER_OVF_IRQ(n) (n * TIMER_IRQ_COUNT + TIMER0_OVF_IRQ) + +static const uint8_t irq168_328[IRQ_COUNT] = { + [TIMER2_COMPA_IRQ] = 8, + [TIMER2_COMPB_IRQ] = 9, + [TIMER2_OVF_IRQ] = 10, + [TIMER1_CAPT_IRQ] = 11, + [TIMER1_COMPA_IRQ] = 12, + [TIMER1_COMPB_IRQ] = 13, + [TIMER1_OVF_IRQ] = 14, + [TIMER0_COMPA_IRQ] = 15, + [TIMER0_COMPB_IRQ] = 16, + [TIMER0_OVF_IRQ] = 17, + [USART0_RXC_IRQ] = 19, + [USART0_DRE_IRQ] = 20, + [USART0_TXC_IRQ] = 21, +}, irq1280_2560[IRQ_COUNT] = { + [TIMER2_COMPA_IRQ] = 14, + [TIMER2_COMPB_IRQ] = 15, + [TIMER2_OVF_IRQ] = 16, + [TIMER1_CAPT_IRQ] = 17, + [TIMER1_COMPA_IRQ] = 18, + [TIMER1_COMPB_IRQ] = 19, + [TIMER1_COMPC_IRQ] = 20, + [TIMER1_OVF_IRQ] = 21, + [TIMER0_COMPA_IRQ] = 22, + [TIMER0_COMPB_IRQ] = 23, + [TIMER0_OVF_IRQ] = 24, + [USART0_RXC_IRQ] = 26, + [USART0_DRE_IRQ] = 27, + [USART0_TXC_IRQ] = 28, + [TIMER3_CAPT_IRQ] = 32, + [TIMER3_COMPA_IRQ] = 33, + [TIMER3_COMPB_IRQ] = 34, + [TIMER3_COMPC_IRQ] = 35, + [TIMER3_OVF_IRQ] = 36, + [USART1_RXC_IRQ] = 37, + [USART1_DRE_IRQ] = 38, + [USART1_TXC_IRQ] = 39, + [TIMER4_CAPT_IRQ] = 42, + [TIMER4_COMPA_IRQ] = 43, + [TIMER4_COMPB_IRQ] = 44, + [TIMER4_COMPC_IRQ] = 45, + [TIMER4_OVF_IRQ] = 46, + [TIMER5_CAPT_IRQ] = 47, + [TIMER5_COMPA_IRQ] = 48, + [TIMER5_COMPB_IRQ] = 49, + [TIMER5_COMPC_IRQ] = 50, + [TIMER5_OVF_IRQ] = 51, + [USART2_RXC_IRQ] = 52, + [USART2_DRE_IRQ] = 53, + [USART2_TXC_IRQ] = 54, + [USART3_RXC_IRQ] = 55, + [USART3_DRE_IRQ] = 56, + [USART3_TXC_IRQ] = 57, +}; + +static void connect_peripheral_irq(const AtmegaMcuClass *mc, + SysBusDevice *sbd, + DeviceState *dev, int n, + unsigned peripheral_irq) +{ + int irq = mc->irq[peripheral_irq]; + + if (!irq) { + return; + } + /* FIXME move that to avr_cpu_set_int() once 'sample' board is removed */ + assert(irq >= 2); + irq -= 2; + + sysbus_connect_irq(sbd, n, qdev_get_gpio_in(dev, irq)); +} + +static void connect_power_reduction_gpio(AtmegaMcuState *s, + const AtmegaMcuClass *mc, + DeviceState *dev, + int peripheral_index) +{ + unsigned power_index = mc->dev[peripheral_index].power_index; + assert(mc->dev[power_index].addr); + sysbus_connect_irq(SYS_BUS_DEVICE(&s->pwr[power_index - POWER0]), + mc->dev[peripheral_index].power_bit, + qdev_get_gpio_in(dev, 0)); +} + +static void atmega_realize(DeviceState *dev, Error **errp) +{ + AtmegaMcuState *s = ATMEGA_MCU(dev); + const AtmegaMcuClass *mc = ATMEGA_MCU_GET_CLASS(dev); + DeviceState *cpudev; + SysBusDevice *sbd; + Error *err = NULL; + char *devname; + size_t i; + + assert(mc->io_size <= 0x200); + + if (!s->xtal_freq_hz) { + error_setg(errp, "\"xtal-frequency-hz\" property must be provided."); + return; + } + + /* CPU */ + object_initialize_child(OBJECT(dev), "cpu", &s->cpu, sizeof(s->cpu), + mc->cpu_type, &err, NULL); + if (err) { + error_propagate(errp, err); + return; + } + object_property_set_bool(OBJECT(&s->cpu), true, "realized", &error_abort); + cpudev = DEVICE(&s->cpu); + + /* SRAM */ + memory_region_init_ram(&s->sram, OBJECT(dev), "sram", mc->sram_size, + &error_abort); + memory_region_add_subregion(get_system_memory(), + OFFSET_DATA + 0x200, &s->sram); + + /* Flash */ + memory_region_init_rom(&s->flash, OBJECT(dev), + "flash", mc->flash_size, &error_fatal); + memory_region_add_subregion(get_system_memory(), OFFSET_CODE, &s->flash); + + /* I/O */ + s->io = qdev_create(NULL, TYPE_UNIMPLEMENTED_DEVICE); + qdev_prop_set_string(s->io, "name", "I/O"); + qdev_prop_set_uint64(s->io, "size", mc->io_size); + qdev_init_nofail(s->io); + sysbus_mmio_map_overlap(SYS_BUS_DEVICE(s->io), 0, OFFSET_DATA, -1234); + + /* Power Reduction */ + for (i = 0; i < POWER_MAX; i++) { + int idx = POWER(i); + if (!mc->dev[idx].addr) { + continue; + } + devname = g_strdup_printf("power%zu", i); + object_initialize_child(OBJECT(dev), devname, + &s->pwr[i], sizeof(s->pwr[i]), + TYPE_AVR_MASK, &error_abort, NULL); + object_property_set_bool(OBJECT(&s->pwr[i]), true, "realized", + &error_abort); + sysbus_mmio_map(SYS_BUS_DEVICE(&s->pwr[i]), 0, + OFFSET_DATA + mc->dev[idx].addr); + g_free(devname); + } + + /* GPIO */ + for (i = 0; i < GPIO_MAX; i++) { + int idx = GPIO(i); + if (!mc->dev[idx].addr) { + continue; + } + devname = g_strdup_printf("avr-gpio-%c", 'a' + (char)i); + create_unimplemented_device(devname, + OFFSET_DATA + mc->dev[idx].addr, 3); + g_free(devname); + } + + /* USART */ + for (i = 0; i < USART_MAX; i++) { + int idx = USART(i); + if (!mc->dev[idx].addr) { + continue; + } + devname = g_strdup_printf("usart%zu", i); + object_initialize_child(OBJECT(dev), devname, + &s->usart[i], sizeof(s->usart[i]), + TYPE_AVR_USART, &error_abort, NULL); + qdev_prop_set_chr(DEVICE(&s->usart[i]), "chardev", serial_hd(i)); + object_property_set_bool(OBJECT(&s->usart[i]), true, "realized", + &error_abort); + sbd = SYS_BUS_DEVICE(&s->usart[i]); + sysbus_mmio_map(sbd, 0, OFFSET_DATA + mc->dev[USART(i)].addr); + connect_peripheral_irq(mc, sbd, cpudev, 0, USART_RXC_IRQ(i)); + connect_peripheral_irq(mc, sbd, cpudev, 1, USART_DRE_IRQ(i)); + connect_peripheral_irq(mc, sbd, cpudev, 2, USART_TXC_IRQ(i)); + connect_power_reduction_gpio(s, mc, DEVICE(&s->usart[i]), idx); + g_free(devname); + } + + /* Timer */ + for (i = 0; i < TIMER_MAX; i++) { + int idx = TIMER(i); + if (!mc->dev[idx].addr) { + continue; + } + if (!mc->dev[idx].is_timer16) { + create_unimplemented_device("avr-timer8", + OFFSET_DATA + mc->dev[idx].addr, 5); + create_unimplemented_device("avr-timer8-intmask", + OFFSET_DATA + + mc->dev[idx].intmask_addr, 1); + create_unimplemented_device("avr-timer8-intflag", + OFFSET_DATA + + mc->dev[idx].intflag_addr, 1); + continue; + } + devname = g_strdup_printf("timer%zu", i); + object_initialize_child(OBJECT(dev), devname, + &s->timer[i], sizeof(s->timer[i]), + TYPE_AVR_TIMER16, &error_abort, NULL); + object_property_set_uint(OBJECT(&s->timer[i]), s->xtal_freq_hz, + "cpu-frequency-hz", &error_abort); + object_property_set_bool(OBJECT(&s->timer[i]), true, "realized", + &error_abort); + sbd = SYS_BUS_DEVICE(&s->timer[i]); + sysbus_mmio_map(sbd, 0, OFFSET_DATA + mc->dev[idx].addr); + sysbus_mmio_map(sbd, 1, OFFSET_DATA + mc->dev[idx].intmask_addr); + sysbus_mmio_map(sbd, 2, OFFSET_DATA + mc->dev[idx].intflag_addr); + connect_peripheral_irq(mc, sbd, cpudev, 0, TIMER_CAPT_IRQ(i)); + connect_peripheral_irq(mc, sbd, cpudev, 1, TIMER_COMPA_IRQ(i)); + connect_peripheral_irq(mc, sbd, cpudev, 2, TIMER_COMPB_IRQ(i)); + connect_peripheral_irq(mc, sbd, cpudev, 3, TIMER_COMPC_IRQ(i)); + connect_peripheral_irq(mc, sbd, cpudev, 4, TIMER_OVF_IRQ(i)); + connect_power_reduction_gpio(s, mc, DEVICE(&s->timer[i]), idx); + g_free(devname); + } + + create_unimplemented_device("avr-twi", OFFSET_DATA + 0x0b8, 6); + create_unimplemented_device("avr-adc", OFFSET_DATA + 0x078, 8); + create_unimplemented_device("avr-ext-mem-ctrl", OFFSET_DATA + 0x074, 2); + create_unimplemented_device("avr-watchdog", OFFSET_DATA + 0x060, 1); + create_unimplemented_device("avr-spi", OFFSET_DATA + 0x04c, 3); + create_unimplemented_device("avr-eeprom", OFFSET_DATA + 0x03f, 3); +} + +static Property atmega_props[] = { + DEFINE_PROP_UINT64("xtal-frequency-hz", AtmegaMcuState, + xtal_freq_hz, 0), + DEFINE_PROP_END_OF_LIST() +}; + +static void atmega_class_init(ObjectClass *oc, void *data) +{ + DeviceClass *dc = DEVICE_CLASS(oc); + + dc->realize = atmega_realize; + dc->props = atmega_props; + /* Reason: Mapped at fixed location on the system bus */ + dc->user_creatable = false; +} + +static void atmega168_class_init(ObjectClass *oc, void *data) +{ + AtmegaMcuClass *amc = ATMEGA_MCU_CLASS(oc); + + amc->cpu_type = AVR_CPU_TYPE_NAME("avr5"); + amc->flash_size = 16 * KiB; + amc->eeprom_size = 512; + amc->sram_size = 1 * KiB; + amc->io_size = 256; + amc->gpio_count = 23; + amc->adc_count = 6; + amc->irq = irq168_328; + amc->dev = dev168_328; +}; + +static void atmega328_class_init(ObjectClass *oc, void *data) +{ + AtmegaMcuClass *amc = ATMEGA_MCU_CLASS(oc); + + amc->cpu_type = AVR_CPU_TYPE_NAME("avr5"); + amc->flash_size = 32 * KiB; + amc->eeprom_size = 1 * KiB; + amc->sram_size = 2 * KiB; + amc->io_size = 256; + amc->gpio_count = 23; + amc->adc_count = 6; + amc->irq = irq168_328; + amc->dev = dev168_328; +}; + +static void atmega1280_class_init(ObjectClass *oc, void *data) +{ + AtmegaMcuClass *amc = ATMEGA_MCU_CLASS(oc); + + amc->cpu_type = AVR_CPU_TYPE_NAME("avr6"); + amc->flash_size = 128 * KiB; + amc->eeprom_size = 4 * KiB; + amc->sram_size = 8 * KiB; + amc->io_size = 512; + amc->gpio_count = 86; + amc->adc_count = 16; + amc->irq = irq1280_2560; + amc->dev = dev1280_2560; +}; + +static void atmega2560_class_init(ObjectClass *oc, void *data) +{ + AtmegaMcuClass *amc = ATMEGA_MCU_CLASS(oc); + + amc->cpu_type = AVR_CPU_TYPE_NAME("avr6"); + amc->flash_size = 256 * KiB; + amc->eeprom_size = 4 * KiB; + amc->sram_size = 8 * KiB; + amc->io_size = 512; + amc->gpio_count = 54; + amc->adc_count = 16; + amc->irq = irq1280_2560; + amc->dev = dev1280_2560; +}; + +static const TypeInfo atmega_mcu_types[] = { + { + .name = TYPE_ATMEGA168_MCU, + .parent = TYPE_ATMEGA_MCU, + .class_init = atmega168_class_init, + }, { + .name = TYPE_ATMEGA328_MCU, + .parent = TYPE_ATMEGA_MCU, + .class_init = atmega328_class_init, + }, { + .name = TYPE_ATMEGA1280_MCU, + .parent = TYPE_ATMEGA_MCU, + .class_init = atmega1280_class_init, + }, { + .name = TYPE_ATMEGA2560_MCU, + .parent = TYPE_ATMEGA_MCU, + .class_init = atmega2560_class_init, + }, { + .name = TYPE_ATMEGA_MCU, + .parent = TYPE_SYS_BUS_DEVICE, + .instance_size = sizeof(AtmegaMcuState), + .class_size = sizeof(AtmegaMcuClass), + .class_init = atmega_class_init, + .abstract = true, + } +}; + +DEFINE_TYPES(atmega_mcu_types) diff --git a/hw/avr/Makefile.objs b/hw/avr/Makefile.objs index 1eb4b53be6..696f855c74 100644 --- a/hw/avr/Makefile.objs +++ b/hw/avr/Makefile.objs @@ -1 +1,2 @@ +obj-$(CONFIG_ATMEL_ATMEGA_MCU) += atmel_atmega.o obj-$(CONFIG_AVR_SAMPLE) += sample.o From patchwork Mon Jan 20 22:01:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 1226144 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amsat.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=S47jwcoU; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 481m944JRRz9s1x for ; Tue, 21 Jan 2020 09:11:36 +1100 (AEDT) Received: from localhost ([::1]:44684 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1itfGf-0005Hu-TU for incoming@patchwork.ozlabs.org; Mon, 20 Jan 2020 17:11:33 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:51124) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1itf6y-0001lG-7k for qemu-devel@nongnu.org; Mon, 20 Jan 2020 17:01:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1itf6w-0005xO-GM for qemu-devel@nongnu.org; Mon, 20 Jan 2020 17:01:32 -0500 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:54705) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1itf6w-0005x6-8z for qemu-devel@nongnu.org; Mon, 20 Jan 2020 17:01:30 -0500 Received: by mail-wm1-x344.google.com with SMTP id b19so895938wmj.4 for ; Mon, 20 Jan 2020 14:01:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4xAHcnSxuBMk7zb5fgFWAPZm2H9yAhWCBtvCp/qIRcY=; b=S47jwcoUWIorP6ILhuEt7LudW1yULyFZ7fRgv1SFT8bNRWB8zoVeIG8xGYctgFmWkX RLNymW1VXqKhub7OYPqin/7PolxjmcZ9R5HDSX0ZLAHXZ06TFpQXBQyDdLyvpZLbg48v B9Qv0NCFZOf+6RSLLbm1SW89BpPr7LDp3NC75/wfdyNNhl1F1xEFnKFl52WVbSMHVEHs yBFt2/mLltzndMRfws44FbSsfXag8omdVxzOhXU456NxuoTtUyIuODiIwYycXGRudOWI cih4u2+PF4664JL1NFVuLSFq55zKWDeVzWxnd8HFMZd19B9k7ZACfOogXVTaqV/pfUjh UlGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=4xAHcnSxuBMk7zb5fgFWAPZm2H9yAhWCBtvCp/qIRcY=; b=FsquTvU7l/IwXw3VJGdIYgoL6qYnjfBdE9uRTHPnc1IOGRsr64ro4ZZF1doYbtFY/S 0btQaUUKexfSEWm1r08zDdbCyefiXhr+LU3wHurVqDtS/Z2gj3SbfXSl2ph+4D+k862+ HyQGP4VAErTpy0DLABa0g9TGOWj3noe39a2KsQadKoPukXiydywsOCDY4TpkjE43gvRY Emv3ZBfQH0gYxtVNHsq5t5F+BWkpwWoFuqRFgltoNrDYjg6cr9dBAnfIKdtN00bAeqmF Gt2wn66VTH7Ck4724Efbwsf3S1CiiXzvEtcNvQ5puy9jzyf6NpMO1ZFK5YJbjbm7paAQ w4aw== X-Gm-Message-State: APjAAAW1AKGJZuesy0wg8lzfdRsb27V5yhqpo19ArVZGK5FLKus7Pi2k 4AICE1HiJ5gce5VueL0PVKfHjSs/ X-Google-Smtp-Source: APXvYqySrLZeQkzK6QtD4HF5Vc9VtxnoX9qmqpwFo3FLU3C8Os1SIJ8JAiNrS1LgmZq/ozwLdzVO8A== X-Received: by 2002:a05:600c:22d3:: with SMTP id 19mr873448wmg.20.1579557689079; Mon, 20 Jan 2020 14:01:29 -0800 (PST) Received: from x1w.redhat.com (113.red-83-57-172.dynamicip.rima-tde.net. [83.57.172.113]) by smtp.gmail.com with ESMTPSA id f1sm904341wmc.45.2020.01.20.14.01.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Jan 2020 14:01:28 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v4 14/18] hw/avr: Add some Arduino boards Date: Mon, 20 Jan 2020 23:01:03 +0100 Message-Id: <20200120220107.17825-15-f4bug@amsat.org> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200120220107.17825-1-f4bug@amsat.org> References: <20200120220107.17825-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::344 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sarah Harris , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= , Michael Rolnik , Igor Mammedov , Aleksandar Markovic , Richard Henderson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Arduino boards are build with AVR chipsets. Add some of the popular boards: - Arduino Duemilanove - Arduino Uno - Arduino Mega For more information: https://www.arduino.cc/en/Main/Products https://store.arduino.cc/arduino-genuino/most-popular Reviewed-by: Igor Mammedov Signed-off-by: Philippe Mathieu-Daudé --- v4: - Remove unused 'extram*' fields (Igor) v2: - Reword description adding more information (Aleksandar) - Use DEFINE_TYPES (Igor) --- default-configs/avr-softmmu.mak | 1 + hw/avr/arduino.c | 175 ++++++++++++++++++++++++++++++++ hw/avr/Kconfig | 4 + hw/avr/Makefile.objs | 1 + 4 files changed, 181 insertions(+) create mode 100644 hw/avr/arduino.c diff --git a/default-configs/avr-softmmu.mak b/default-configs/avr-softmmu.mak index d1e1c28118..d8d1d8e6fe 100644 --- a/default-configs/avr-softmmu.mak +++ b/default-configs/avr-softmmu.mak @@ -2,4 +2,5 @@ # Boards: # +CONFIG_ARDUINO=y CONFIG_AVR_SAMPLE=y diff --git a/hw/avr/arduino.c b/hw/avr/arduino.c new file mode 100644 index 0000000000..784246baba --- /dev/null +++ b/hw/avr/arduino.c @@ -0,0 +1,175 @@ +/* + * QEMU Arduino boards + * + * Copyright (c) 2019 Philippe Mathieu-Daudé + * + * This work is licensed under the terms of the GNU GPLv2 or later. + * See the COPYING file in the top-level directory. + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +/* TODO: Implement the use of EXTRAM */ + +#include "qemu/osdep.h" +#include "qemu-common.h" +#include "qapi/error.h" +#include "hw/boards.h" +#include "hw/loader.h" +#include "elf.h" +#include "atmel_atmega.h" + +typedef struct ArduinoMachineState { + /*< private >*/ + MachineState parent_obj; + /*< public >*/ + AtmegaMcuState mcu; +} ArduinoMachineState; + +typedef struct ArduinoMachineClass { + /*< private >*/ + MachineClass parent_class; + /*< public >*/ + const char *mcu_type; + uint64_t xtal_hz; +} ArduinoMachineClass; + +#define TYPE_ARDUINO_MACHINE \ + MACHINE_TYPE_NAME("arduino") +#define ARDUINO_MACHINE(obj) \ + OBJECT_CHECK(ArduinoMachineState, (obj), TYPE_ARDUINO_MACHINE) +#define ARDUINO_MACHINE_CLASS(klass) \ + OBJECT_CLASS_CHECK(ArduinoMachineClass, (klass), TYPE_ARDUINO_MACHINE) +#define ARDUINO_MACHINE_GET_CLASS(obj) \ + OBJECT_GET_CLASS(ArduinoMachineClass, (obj), TYPE_ARDUINO_MACHINE) + +static void load_firmware(const char *firmware, uint64_t flash_size) +{ + const char *filename; + int bytes_loaded; + + /* Load firmware (contents of flash) trying to auto-detect format */ + filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, firmware); + if (filename == NULL) { + error_report("Unable to find %s", firmware); + exit(1); + } + + bytes_loaded = load_elf(filename, NULL, NULL, NULL, NULL, NULL, NULL, + 0, EM_NONE, 0, 0); + if (bytes_loaded < 0) { + bytes_loaded = load_image_targphys(filename, OFFSET_CODE, flash_size); + } + if (bytes_loaded < 0) { + error_report("Unable to load firmware image %s as ELF or raw binary", + firmware); + exit(1); + } +} + +static void arduino_machine_init(MachineState *machine) +{ + ArduinoMachineClass *amc = ARDUINO_MACHINE_GET_CLASS(machine); + ArduinoMachineState *ams = ARDUINO_MACHINE(machine); + + sysbus_init_child_obj(OBJECT(machine), "mcu", &ams->mcu, sizeof(ams->mcu), + amc->mcu_type); + object_property_set_uint(OBJECT(&ams->mcu), amc->xtal_hz, + "xtal-frequency-hz", &error_abort); + object_property_set_bool(OBJECT(&ams->mcu), true, "realized", + &error_abort); + + if (machine->firmware) { + load_firmware(machine->firmware, memory_region_size(&ams->mcu.flash)); + } +} + +static void arduino_machine_class_init(ObjectClass *oc, void *data) +{ + MachineClass *mc = MACHINE_CLASS(oc); + + mc->init = arduino_machine_init; + mc->default_cpus = 1; + mc->min_cpus = mc->default_cpus; + mc->max_cpus = mc->default_cpus; + mc->no_floppy = 1; + mc->no_cdrom = 1; + mc->no_parallel = 1; +} + +static void arduino_duemilanove_class_init(ObjectClass *oc, void *data) +{ + MachineClass *mc = MACHINE_CLASS(oc); + ArduinoMachineClass *amc = ARDUINO_MACHINE_CLASS(oc); + + /* https://www.arduino.cc/en/Main/ArduinoBoardDuemilanove */ + mc->desc = "Arduino Duemilanove (ATmega168)", + mc->alias = "2009"; + amc->mcu_type = TYPE_ATMEGA168_MCU; + amc->xtal_hz = 16 * 1000 * 1000; +}; + +static void arduino_uno_class_init(ObjectClass *oc, void *data) +{ + MachineClass *mc = MACHINE_CLASS(oc); + ArduinoMachineClass *amc = ARDUINO_MACHINE_CLASS(oc); + + /* https://store.arduino.cc/arduino-uno-rev3 */ + mc->desc = "Arduino UNO (ATmega328P)"; + mc->alias = "uno"; + amc->mcu_type = TYPE_ATMEGA328_MCU; + amc->xtal_hz = 16 * 1000 * 1000; +}; + +static void arduino_mega_class_init(ObjectClass *oc, void *data) +{ + MachineClass *mc = MACHINE_CLASS(oc); + ArduinoMachineClass *amc = ARDUINO_MACHINE_CLASS(oc); + + /* https://www.arduino.cc/en/Main/ArduinoBoardMega */ + mc->desc = "Arduino Mega (ATmega1280)"; + mc->alias = "mega"; + amc->mcu_type = TYPE_ATMEGA1280_MCU; + amc->xtal_hz = 16 * 1000 * 1000; +}; + +static void arduino_mega2560_class_init(ObjectClass *oc, void *data) +{ + MachineClass *mc = MACHINE_CLASS(oc); + ArduinoMachineClass *amc = ARDUINO_MACHINE_CLASS(oc); + + /* https://store.arduino.cc/arduino-mega-2560-rev3 */ + mc->desc = "Arduino Mega 2560 (ATmega2560)"; + mc->alias = "mega2560"; + mc->is_default = true; + amc->mcu_type = TYPE_ATMEGA2560_MCU; + amc->xtal_hz = 16 * 1000 * 1000; /* CSTCE16M0V53-R0 */ +}; + +static const TypeInfo arduino_machine_types[] = { + { + .name = MACHINE_TYPE_NAME("arduino-duemilanove"), + .parent = TYPE_ARDUINO_MACHINE, + .class_init = arduino_duemilanove_class_init, + }, { + .name = MACHINE_TYPE_NAME("arduino-uno"), + .parent = TYPE_ARDUINO_MACHINE, + .class_init = arduino_uno_class_init, + }, { + .name = MACHINE_TYPE_NAME("arduino-mega"), + .parent = TYPE_ARDUINO_MACHINE, + .class_init = arduino_mega_class_init, + }, { + .name = MACHINE_TYPE_NAME("arduino-mega-2560-v3"), + .parent = TYPE_ARDUINO_MACHINE, + .class_init = arduino_mega2560_class_init, + }, { + .name = TYPE_ARDUINO_MACHINE, + .parent = TYPE_MACHINE, + .instance_size = sizeof(ArduinoMachineState), + .class_size = sizeof(ArduinoMachineClass), + .class_init = arduino_machine_class_init, + .abstract = true, + } +}; + +DEFINE_TYPES(arduino_machine_types) diff --git a/hw/avr/Kconfig b/hw/avr/Kconfig index 228eae7582..7907584ac7 100644 --- a/hw/avr/Kconfig +++ b/hw/avr/Kconfig @@ -4,6 +4,10 @@ config ATMEL_ATMEGA_MCU select ATMEL_USART select ATMEL_POWER +config ARDUINO + select ATMEL_ATMEGA_MCU + select UNIMP + config AVR_SAMPLE select ATMEL_ATMEGA_MCU select UNIMP diff --git a/hw/avr/Makefile.objs b/hw/avr/Makefile.objs index 696f855c74..b36ca77cf0 100644 --- a/hw/avr/Makefile.objs +++ b/hw/avr/Makefile.objs @@ -1,2 +1,3 @@ obj-$(CONFIG_ATMEL_ATMEGA_MCU) += atmel_atmega.o +obj-$(CONFIG_ARDUINO) += arduino.o obj-$(CONFIG_AVR_SAMPLE) += sample.o From patchwork Mon Jan 20 22:01:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 1226143 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amsat.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=rfe02ht2; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 481m6y6WQNz9sPK for ; Tue, 21 Jan 2020 09:09:46 +1100 (AEDT) Received: from localhost ([::1]:44656 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1itfEt-0002mC-81 for incoming@patchwork.ozlabs.org; Mon, 20 Jan 2020 17:09:43 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:51133) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1itf6y-0001mD-SP for qemu-devel@nongnu.org; Mon, 20 Jan 2020 17:01:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1itf6x-0005xj-PY for qemu-devel@nongnu.org; Mon, 20 Jan 2020 17:01:32 -0500 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:44714) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1itf6x-0005xZ-Jb for qemu-devel@nongnu.org; Mon, 20 Jan 2020 17:01:31 -0500 Received: by mail-wr1-x442.google.com with SMTP id q10so1063855wrm.11 for ; Mon, 20 Jan 2020 14:01:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Xg0HdeiM+XtBmFtO3KRtANHzmSdpyDnaxVEyGkgZkR8=; b=rfe02ht2iq5YEKlmbe/kcIYVoissh8/cW66pIlwxIsuphyLhCINQYi0ARGCmojmh8z 8uDV6ZmwidAx35oKiQ6wzqN9kdfzB8SQvocksef6rGVb/9idrdbTFJj3BCheIBekcv2C +ZOZWj1zmpI7jpt/OrFQlazEcQ7ghOX41r/N8YqLS299/vvw3Ua21ABZReOw3T96rqpo qCDUw8t2+zkjmTLLnwzscaDSfG6qMc+0T5frKPdqNHkp538LQtekeV3NWOnnzW0+eUbW NVVHbqIbXtdGGKNMCt4A2YHbjR0v/MVxGDFRBZXSju1jFqgGdwLV1mXOLSgW3Hi0pGrw CcsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=Xg0HdeiM+XtBmFtO3KRtANHzmSdpyDnaxVEyGkgZkR8=; b=uOVqoNN385dxkRTXRRr3PQV17qErE0gowHKkWcx8nNaBqfFJdQvgRoWkluUtP0JYI0 EKEds5h2iYvUyUy2TqQQ+sKIU7l9nnlm2MgDRHpeAUApOGl5o8TXySRIcp0sFFQS5gHw sgdfeqCA0dIaxPn3ovLRDI/KrmiOsYQK1ARyTrVgyuoj8Fre2Rn32bfBGJVZPJxmooQL hvwtUUO+8NzYijBWXypvBURah2ua/xRDZ8Q4g1nedQJHxrQzDojTMyqeLjln5aWb/qtT cE41HsxPpUGOo06YV4dq5tMjBdTS92LoGnk7VN3QBi16IRYd1RAp0GcISO+Uz5b9W36+ lhtw== X-Gm-Message-State: APjAAAUEbDTF32GwWw5W4x8gsJuRx1TIMnwoFmv1Kr0MJ0GTZZ5C73Hl bjVdniO7Zul/PdYazdaYRb4u3mSq X-Google-Smtp-Source: APXvYqyABbklxgpRz0UDe8cX6hPRKiHVf7KY+Dd5muUHOa0w+afZyqEEpzFhlLASxNr56CiOQP4kvQ== X-Received: by 2002:a05:6000:1047:: with SMTP id c7mr1486452wrx.341.1579557690509; Mon, 20 Jan 2020 14:01:30 -0800 (PST) Received: from x1w.redhat.com (113.red-83-57-172.dynamicip.rima-tde.net. [83.57.172.113]) by smtp.gmail.com with ESMTPSA id f1sm904341wmc.45.2020.01.20.14.01.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Jan 2020 14:01:29 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v4 15/18] tests/boot-serial-test: Test some Arduino boards (AVR based) Date: Mon, 20 Jan 2020 23:01:04 +0100 Message-Id: <20200120220107.17825-16-f4bug@amsat.org> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200120220107.17825-1-f4bug@amsat.org> References: <20200120220107.17825-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::442 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Thomas Huth , Sarah Harris , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= , Michael Rolnik , Paolo Bonzini , Aleksandar Markovic , Richard Henderson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The Arduino Duemilanove is based on a AVR5 CPU, while the Arduino MEGA2560 on a AVR6 CPU. Signed-off-by: Philippe Mathieu-Daudé Acked-by: Thomas Huth --- tests/qtest/boot-serial-test.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/qtest/boot-serial-test.c b/tests/qtest/boot-serial-test.c index e556f09db8..582a497963 100644 --- a/tests/qtest/boot-serial-test.c +++ b/tests/qtest/boot-serial-test.c @@ -113,6 +113,8 @@ typedef struct testdef { static testdef_t tests[] = { { "alpha", "clipper", "", "PCI:" }, { "avr", "sample", "", "T", sizeof(bios_avr), NULL, bios_avr }, + { "avr", "arduino-duemilanove", "", "T", sizeof(bios_avr), NULL, bios_avr }, + { "avr", "arduino-mega-2560-v3", "", "T", sizeof(bios_avr), NULL, bios_avr}, { "ppc", "ppce500", "", "U-Boot" }, { "ppc", "40p", "-vga none -boot d", "Trying cd:," }, { "ppc", "g3beige", "", "PowerPC,750" }, From patchwork Mon Jan 20 22:01:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 1226148 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amsat.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=JElk8Zfx; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 481mBF5CkCz9sR4 for ; Tue, 21 Jan 2020 09:12:36 +1100 (AEDT) Received: from localhost ([::1]:44692 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1itfHd-0006Y9-GD for incoming@patchwork.ozlabs.org; Mon, 20 Jan 2020 17:12:33 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:51154) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1itf70-0001oQ-Nn for qemu-devel@nongnu.org; Mon, 20 Jan 2020 17:01:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1itf6z-0005yb-Dy for qemu-devel@nongnu.org; Mon, 20 Jan 2020 17:01:34 -0500 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]:44845) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1itf6z-0005yH-71 for qemu-devel@nongnu.org; Mon, 20 Jan 2020 17:01:33 -0500 Received: by mail-wr1-x429.google.com with SMTP id q10so1063904wrm.11 for ; Mon, 20 Jan 2020 14:01:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=PKTXExoANFsgS8Ee5P5ychq32drqafI8xSRUijLe4QA=; b=JElk8ZfxaW0vbZWvuPu1QPzma+S3K3fJVaonIU/j1yuhmR5IW39bJDdwe3iLp8oE5w HHw8dEY91yJ817/BTm271Idh5KPIP05Bgnce/DIQ7a365CmYoKNm7Buqwob9rDf423fp N4yGaS+KdCYCO/j16NdXFWodkiebJuKGupd8GQPKEWrdxE5CH231YiUnAxetCS1B5R2G TGvETPjtg0DeLF48CR/QZTfCQ+SneeJMu7lZRrhjAfpDirrsSxSSvlNVsqKKCqRL6td1 4lVTyNcGUnmkKp9N+BUvqlYLuT9jhAYCvbBZ/9up8JoAw6hets6MFfRLRdSBISe+hAMg mlqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=PKTXExoANFsgS8Ee5P5ychq32drqafI8xSRUijLe4QA=; b=BhLxez0F/BDJQ+F2LRHymz/y9sAiSRin0squMD9E2rl5ksJu9TGIfhArgtMdS0CsKd LmteGEJS+BO9f894aMHmZELiZ7QUd3wd5njOw1htIj5HZG/MY73NeO8VhBTke8j3Ipcr 1eLdu8p0rPRiXKfWppj8dlEv/xuS0h0QNmCWSe10vZL/BaMG3NI3gYiy4RZToYu8Obcj J0y5HX8x4NfwSVaAywr5b7Up7/z58a/B0MJaYP/DOsF8uFD9GI9VESUCQLhazLaxo3NT M+QWHzFKJlcBOQzT30KMenWT9HpErlo4DadETKDZYW0UwtoRC389ceRvCdnB5/I5j2Mf Hbqg== X-Gm-Message-State: APjAAAX7sVLJ7Nrj1wqzfG8e2PHO96S0C0KrQhELVj4cqgs3J4zkX6de ZecGK6Kd9ZqRrelFf2cAl6uNaFtW X-Google-Smtp-Source: APXvYqx3GuIZj6HIVqFPnrFmVWGegg8mBIv+f9vG+uHM5EQJfVmG/N6htfb2dQYSmGYn16mvbZY0vg== X-Received: by 2002:a5d:6346:: with SMTP id b6mr1499549wrw.354.1579557692019; Mon, 20 Jan 2020 14:01:32 -0800 (PST) Received: from x1w.redhat.com (113.red-83-57-172.dynamicip.rima-tde.net. [83.57.172.113]) by smtp.gmail.com with ESMTPSA id f1sm904341wmc.45.2020.01.20.14.01.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Jan 2020 14:01:31 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v4 16/18] tests/acceptance: Test the Arduino MEGA2560 board Date: Mon, 20 Jan 2020 23:01:05 +0100 Message-Id: <20200120220107.17825-17-f4bug@amsat.org> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200120220107.17825-1-f4bug@amsat.org> References: <20200120220107.17825-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::429 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sarah Harris , Michael Rolnik , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Aleksandar Markovic , Richard Henderson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" As the path name demonstrates, the FreeRTOS tests target a board based on a ATMega2560 MCU. We have one, the Arduino MEGA2560. Complementary documentation: https://feilipu.me/2012/01/15/ethermega-arduino-mega-2560-and-freertos/ https://feilipu.me/2015/11/24/arduino_freertos/ (see 'Compatibility') Signed-off-by: Philippe Mathieu-Daudé --- tests/acceptance/machine_avr6.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/acceptance/machine_avr6.py b/tests/acceptance/machine_avr6.py index 611f6a62a4..b644d2a81c 100644 --- a/tests/acceptance/machine_avr6.py +++ b/tests/acceptance/machine_avr6.py @@ -27,7 +27,7 @@ class AVR6Machine(Test): def test_freertos(self): """ :avocado: tags=arch:avr - :avocado: tags=machine:sample + :avocado: tags=machine:arduino-mega-2560-v3 """ """ https://github.com/seharris/qemu-avr-tests/raw/master/free-rtos/Demo/AVR_ATMega2560_GCC/demo.elf From patchwork Mon Jan 20 22:01:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 1226149 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amsat.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=PtnKeuTO; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 481mDR5j9Lz9s1x for ; Tue, 21 Jan 2020 09:14:31 +1100 (AEDT) Received: from localhost ([::1]:44710 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1itfJV-0000mO-4X for incoming@patchwork.ozlabs.org; Mon, 20 Jan 2020 17:14:29 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:51173) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1itf73-0001rh-Dq for qemu-devel@nongnu.org; Mon, 20 Jan 2020 17:01:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1itf70-0005zR-Vc for qemu-devel@nongnu.org; Mon, 20 Jan 2020 17:01:37 -0500 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:39425) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1itf70-0005z7-O5 for qemu-devel@nongnu.org; Mon, 20 Jan 2020 17:01:34 -0500 Received: by mail-wr1-x444.google.com with SMTP id y11so1100709wrt.6 for ; Mon, 20 Jan 2020 14:01:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=qKKy1SZvFws5yZqExt6szwtl12gCjt5k/DbYWN76mWU=; b=PtnKeuTOxPwMd39FdxMQIRhI8nr6+JLKY+OPJQuEemZ/o/pKSTioqBH8V4D2dkho9F QYB7dcaPAbYbNFRHNjmQTO3uoMbzhDsX33sgmcsxZ4l/ymEgyTVWzfdLwvkrdsx3MLj8 76sSLE8FjCc2ABGaIbZv+aJaxYrx5L4JWvWhmeR30qnpGTQOxKH9e95WmZV7WNZfP0sy K30Qu/l5A60n01jbwx5niNRv6v7wk7LtselbhpydoeitHAznF9zE0m/otHCtAkPq0HaD h87XPii86tVHG6inHgFusXJoL94JRzfTIAfIln1qilBbU1YLZArspkzxvkMYfAqoQHYA L/7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=qKKy1SZvFws5yZqExt6szwtl12gCjt5k/DbYWN76mWU=; b=LayALOD0Ne8NDitQ2UWgbaqvLFmCD6RjRh5GuCIk20Ds7wGy/1tZLwI1y/2Baak/0e fJ50d3fL76wofzhG8/fVZ+GnCbkGrvaeMemshSgbFCy/MayKaaracBG7kT69gzoW4Kpj 4NQSqdQDN26LBg8QIVXQSDryXYzMms/RmS821mZrNVornLhJ9yB/fhfGz+jHSWltIRXT MzJsdfyKY/G3cKBHFISCi6Isy14QPdyoUX1cpwEw5JPg9cJ9c2TT5Y6fHcD5elu9Vp4N Vbyt7zJ/kyo/3t65e4VzwEWE6XNUunwJHu4brldAlRQdatFSdUWY4PMKK7o5KbFnHzJY 4V7g== X-Gm-Message-State: APjAAAWBTZ641wq9DV/N6ohzPcmdv96UoJBsRmmOTIS/dOqus5V9oQeq fS/HtO0Pmm9GCYbneFUQjKAEbAjD X-Google-Smtp-Source: APXvYqyXXA0ukjhkslPtNu5GRUd/wSQ/+KNp5Tg2WNUEfIfLoOwgYxxDP1F/PxCHizti/QxEkud/tg== X-Received: by 2002:adf:ec4c:: with SMTP id w12mr1600134wrn.124.1579557693429; Mon, 20 Jan 2020 14:01:33 -0800 (PST) Received: from x1w.redhat.com (113.red-83-57-172.dynamicip.rima-tde.net. [83.57.172.113]) by smtp.gmail.com with ESMTPSA id f1sm904341wmc.45.2020.01.20.14.01.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Jan 2020 14:01:32 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v4 17/18] hw/avr: Remove the unrealistic AVR 'sample' board Date: Mon, 20 Jan 2020 23:01:06 +0100 Message-Id: <20200120220107.17825-18-f4bug@amsat.org> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200120220107.17825-1-f4bug@amsat.org> References: <20200120220107.17825-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::444 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Thomas Huth , Sarah Harris , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= , Michael Rolnik , Paolo Bonzini , Aleksandar Markovic , Richard Henderson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The 'arduino-mega-2560-v3' board fully replace the 'sample' board. Signed-off-by: Philippe Mathieu-Daudé --- !squash? --- default-configs/avr-softmmu.mak | 1 - hw/avr/sample.c | 295 -------------------------------- tests/qtest/boot-serial-test.c | 1 - hw/avr/Kconfig | 4 - hw/avr/Makefile.objs | 1 - 5 files changed, 302 deletions(-) delete mode 100644 hw/avr/sample.c diff --git a/default-configs/avr-softmmu.mak b/default-configs/avr-softmmu.mak index d8d1d8e6fe..80218add98 100644 --- a/default-configs/avr-softmmu.mak +++ b/default-configs/avr-softmmu.mak @@ -3,4 +3,3 @@ # Boards: # CONFIG_ARDUINO=y -CONFIG_AVR_SAMPLE=y diff --git a/hw/avr/sample.c b/hw/avr/sample.c deleted file mode 100644 index 19b8c067e5..0000000000 --- a/hw/avr/sample.c +++ /dev/null @@ -1,295 +0,0 @@ -/* - * QEMU AVR CPU - * - * Copyright (c) 2019 Michael Rolnik - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, see - * - */ - -/* - * NOTE: - * This is not a real AVR board, this is an example! - * The CPU is an approximation of an ATmega2560, but is missing various - * built-in peripherals. - * - * This example board loads provided binary file into flash memory and - * executes it from 0x00000000 address in the code memory space. - * - * Currently used for AVR CPU validation - * - */ - -#include "qemu/osdep.h" -#include "qapi/error.h" -#include "qemu-common.h" -#include "cpu.h" -#include "hw/hw.h" -#include "sysemu/sysemu.h" -#include "sysemu/qtest.h" -#include "ui/console.h" -#include "hw/boards.h" -#include "hw/loader.h" -#include "qemu/error-report.h" -#include "exec/address-spaces.h" -#include "include/hw/sysbus.h" -#include "include/hw/char/atmel_usart.h" -#include "include/hw/timer/atmel_timer16.h" -#include "include/hw/misc/atmel_power.h" -#include "elf.h" -#include "hw/misc/unimp.h" - -#define SIZE_FLASH 0x00040000 -#define SIZE_SRAM 0x00002000 -/* - * Size of additional "external" memory, as if the AVR were configured to use - * an external RAM chip. - * Note that the configuration registers that normally enable this feature are - * unimplemented. - */ -#define SIZE_EXMEM 0x00000000 - -/* Offsets of peripherals in emulated memory space (i.e. not host addresses) */ -#define PRR0_BASE 0x64 -#define PRR1_BASE 0x65 -#define USART_BASE 0xc0 -#define TIMER1_BASE 0x80 -#define TIMER1_IMSK_BASE 0x6f -#define TIMER1_IFR_BASE 0x36 - -/* Interrupt numbers used by peripherals */ -#define USART_RXC_IRQ 24 -#define USART_DRE_IRQ 25 -#define USART_TXC_IRQ 26 - -#define TIMER1_CAPT_IRQ 15 -#define TIMER1_COMPA_IRQ 16 -#define TIMER1_COMPB_IRQ 17 -#define TIMER1_COMPC_IRQ 18 -#define TIMER1_OVF_IRQ 19 - -/* Power reduction */ -#define PRR1_BIT_PRTIM5 0x05 /* Timer/Counter5 */ -#define PRR1_BIT_PRTIM4 0x04 /* Timer/Counter4 */ -#define PRR1_BIT_PRTIM3 0x03 /* Timer/Counter3 */ -#define PRR1_BIT_PRUSART3 0x02 /* USART3 */ -#define PRR1_BIT_PRUSART2 0x01 /* USART2 */ -#define PRR1_BIT_PRUSART1 0x00 /* USART1 */ - -#define PRR0_BIT_PRTWI 0x06 /* TWI */ -#define PRR0_BIT_PRTIM2 0x05 /* Timer/Counter2 */ -#define PRR0_BIT_PRTIM0 0x04 /* Timer/Counter0 */ -#define PRR0_BIT_PRTIM1 0x03 /* Timer/Counter1 */ -#define PRR0_BIT_PRSPI 0x02 /* Serial Peripheral Interface */ -#define PRR0_BIT_PRUSART0 0x01 /* USART0 */ -#define PRR0_BIT_PRADC 0x00 /* ADC */ - -#define configCPU_CLOCK_HZ ((unsigned long)16000000) - -typedef struct { - MachineClass parent; -} SampleMachineClass; - -typedef struct { - MachineState parent; - MemoryRegion *ram; - MemoryRegion *flash; - AVRUsartState *usart0; - AVRTimer16State *timer1; - AVRMaskState *prr[2]; -} SampleMachineState; - -#define TYPE_SAMPLE_MACHINE MACHINE_TYPE_NAME("sample") - -#define SAMPLE_MACHINE(obj) \ - OBJECT_CHECK(SampleMachineState, obj, TYPE_SAMPLE_MACHINE) -#define SAMPLE_MACHINE_GET_CLASS(obj) \ - OBJECT_GET_CLASS(SampleMachineClass, obj, TYPE_SAMPLE_MACHINE) -#define SAMPLE_MACHINE_CLASS(klass) \ - OBJECT_CLASS_CHECK(SampleMachineClass, klass, TYPE_SAMPLE_MACHINE) - -static void sample_init(MachineState *machine) -{ - SampleMachineState *sms = SAMPLE_MACHINE(machine); - MemoryRegion *system_memory = get_system_memory(); - AVRCPU *cpu; - const char *firmware = NULL; - const char *filename = NULL; - const char *cpu_type = NULL; - uint32_t e_flags; - int bytes_loaded; - SysBusDevice *busdev; - DeviceState *cpudev; - - system_memory = get_system_memory(); - sms->ram = g_new(MemoryRegion, 1); - sms->flash = g_new(MemoryRegion, 1); - - /* if ELF file is provided, determine CPU type reading ELF e_flags */ - cpu_type = machine->cpu_type; - firmware = machine->firmware; - if (firmware != NULL) { - filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, firmware); - if (filename == NULL) { - error_report("Unable to find %s", firmware); - exit(1); - } - - bytes_loaded = load_elf_ram_sym(filename, NULL, NULL, NULL, NULL, NULL, - NULL, &e_flags, 0, EM_AVR, 0, 0, NULL, 0, 0); - if (bytes_loaded > 0) { - cpu_type = avr_flags_to_cpu_type(e_flags, cpu_type); - } - } - - cpu = AVR_CPU(cpu_create(cpu_type)); - cpudev = DEVICE(cpu); - - memory_region_init_rom(sms->flash, NULL, "avr.flash", SIZE_FLASH, - &error_fatal); - memory_region_add_subregion(system_memory, OFFSET_CODE, sms->flash); - - /* following are atmel2560 device */ - create_unimplemented_device("usart 3", OFFSET_DATA + 0x0130, 0x0007); - create_unimplemented_device("timer-counter-16bit 5", - OFFSET_DATA + 0x0120, 0x000e); - create_unimplemented_device("gpio L", OFFSET_DATA + 0x0109, 0x0003); - create_unimplemented_device("gpio K", OFFSET_DATA + 0x0106, 0x0003); - create_unimplemented_device("gpio J", OFFSET_DATA + 0x0103, 0x0003); - create_unimplemented_device("gpio H", OFFSET_DATA + 0x0100, 0x0003); - create_unimplemented_device("usart 2", OFFSET_DATA + 0x00d0, 0x0007); - create_unimplemented_device("usart 1", OFFSET_DATA + 0x00c8, 0x0007); - create_unimplemented_device("twi", OFFSET_DATA + 0x00b8, 0x0006); - create_unimplemented_device("timer-counter-async-8bit 2", - OFFSET_DATA + 0x00b0, 0x0007); - create_unimplemented_device("timer-counter-16bit 4", - OFFSET_DATA + 0x00a0, 0x000e); - create_unimplemented_device("timer-counter-16bit 3", - OFFSET_DATA + 0x0090, 0x000e); - create_unimplemented_device("ac / adc", - OFFSET_DATA + 0x0078, 0x0008); - create_unimplemented_device("ext-mem-iface", - OFFSET_DATA + 0x0074, 0x0002); - create_unimplemented_device("int-controller", - OFFSET_DATA + 0x0068, 0x0006); - create_unimplemented_device("sys", - OFFSET_DATA + 0x0060, 0x0007); - create_unimplemented_device("spi", - OFFSET_DATA + 0x004c, 0x0003); - create_unimplemented_device("ext-mem-iface", - OFFSET_DATA + 0x004a, 0x0002); - create_unimplemented_device("timer-counter-pwm-8bit 0", - OFFSET_DATA + 0x0044, 0x0005); - create_unimplemented_device("ext-mem-iface", - OFFSET_DATA + 0x003e, 0x0005); - create_unimplemented_device("int-controller", - OFFSET_DATA + 0x0035, 0x0009); - create_unimplemented_device("gpio G", OFFSET_DATA + 0x0032, 0x0003); - create_unimplemented_device("gpio F", OFFSET_DATA + 0x002f, 0x0003); - create_unimplemented_device("gpio E", OFFSET_DATA + 0x002c, 0x0003); - create_unimplemented_device("gpio D", OFFSET_DATA + 0x0029, 0x0003); - create_unimplemented_device("gpio C", OFFSET_DATA + 0x0026, 0x0003); - create_unimplemented_device("gpio B", OFFSET_DATA + 0x0023, 0x0003); - create_unimplemented_device("gpio A", OFFSET_DATA + 0x0020, 0x0003); - - memory_region_allocate_system_memory( - sms->ram, NULL, "avr.ram", SIZE_SRAM + SIZE_EXMEM); - memory_region_add_subregion(system_memory, OFFSET_DATA + 0x200, sms->ram); - - /* Power Reduction built-in peripheral */ - sms->prr[0] = AVR_MASK(sysbus_create_simple(TYPE_AVR_MASK, - OFFSET_DATA + PRR0_BASE, NULL)); - sms->prr[1] = AVR_MASK(sysbus_create_simple(TYPE_AVR_MASK, - OFFSET_DATA + PRR1_BASE, NULL)); - - /* USART 0 built-in peripheral */ - sms->usart0 = AVR_USART(object_new(TYPE_AVR_USART)); - busdev = SYS_BUS_DEVICE(sms->usart0); - qdev_prop_set_chr(DEVICE(sms->usart0), "chardev", serial_hd(0)); - object_property_set_bool(OBJECT(sms->usart0), true, "realized", - &error_fatal); - sysbus_mmio_map(busdev, 0, OFFSET_DATA + USART_BASE); - /* - * These IRQ numbers don't match the datasheet because we're counting from - * zero and not including reset. - */ - sysbus_connect_irq(busdev, 0, qdev_get_gpio_in(cpudev, USART_RXC_IRQ)); - sysbus_connect_irq(busdev, 1, qdev_get_gpio_in(cpudev, USART_DRE_IRQ)); - sysbus_connect_irq(busdev, 2, qdev_get_gpio_in(cpudev, USART_TXC_IRQ)); - sysbus_connect_irq(SYS_BUS_DEVICE(sms->prr[1]), PRR1_BIT_PRUSART1, - qdev_get_gpio_in(DEVICE(sms->usart0), 0)); - - /* Timer 1 built-in periphal */ - sms->timer1 = AVR_TIMER16(object_new(TYPE_AVR_TIMER16)); - object_property_set_uint(OBJECT(sms->timer1), 1, "id", &error_abort); - object_property_set_uint(OBJECT(sms->timer1), configCPU_CLOCK_HZ, - "cpu-frequency-hz", &error_abort); - object_property_set_bool(OBJECT(sms->timer1), true, "realized", - &error_fatal); - busdev = SYS_BUS_DEVICE(sms->timer1); - sysbus_mmio_map(busdev, 0, OFFSET_DATA + TIMER1_BASE); - sysbus_mmio_map(busdev, 1, OFFSET_DATA + TIMER1_IMSK_BASE); - sysbus_mmio_map(busdev, 2, OFFSET_DATA + TIMER1_IFR_BASE); - sysbus_connect_irq(busdev, 0, qdev_get_gpio_in(cpudev, TIMER1_CAPT_IRQ)); - sysbus_connect_irq(busdev, 1, qdev_get_gpio_in(cpudev, TIMER1_COMPA_IRQ)); - sysbus_connect_irq(busdev, 2, qdev_get_gpio_in(cpudev, TIMER1_COMPB_IRQ)); - sysbus_connect_irq(busdev, 3, qdev_get_gpio_in(cpudev, TIMER1_COMPC_IRQ)); - sysbus_connect_irq(busdev, 4, qdev_get_gpio_in(cpudev, TIMER1_OVF_IRQ)); - sysbus_connect_irq(SYS_BUS_DEVICE(sms->prr[0]), PRR0_BIT_PRTIM1, - qdev_get_gpio_in(DEVICE(sms->timer1), 0)); - - /* Load firmware (contents of flash) trying to auto-detect format */ - if (filename != NULL) { - bytes_loaded = load_elf( - filename, NULL, NULL, NULL, NULL, NULL, NULL, 0, EM_NONE, 0, 0); - if (bytes_loaded < 0) { - bytes_loaded = load_image_targphys( - filename, OFFSET_CODE, SIZE_FLASH); - } - if (bytes_loaded < 0) { - error_report( - "Unable to load firmware image %s as ELF or raw binary", - firmware); - exit(1); - } - } -} - -static void sample_class_init(ObjectClass *oc, void *data) -{ - MachineClass *mc = MACHINE_CLASS(oc); - - mc->desc = "AVR sample/example board (ATmega2560)"; - mc->init = sample_init; - mc->default_cpus = 1; - mc->min_cpus = mc->default_cpus; - mc->max_cpus = mc->default_cpus; - mc->default_cpu_type = AVR_CPU_TYPE_NAME("avr5"); - mc->is_default = 1; -} - -static const TypeInfo sample_info = { - .name = TYPE_SAMPLE_MACHINE, - .parent = TYPE_MACHINE, - .instance_size = sizeof(SampleMachineState), - .class_size = sizeof(SampleMachineClass), - .class_init = sample_class_init, -}; - -static void sample_machine_init(void) -{ - type_register_static(&sample_info); -} - -type_init(sample_machine_init); diff --git a/tests/qtest/boot-serial-test.c b/tests/qtest/boot-serial-test.c index 582a497963..07067b76a2 100644 --- a/tests/qtest/boot-serial-test.c +++ b/tests/qtest/boot-serial-test.c @@ -112,7 +112,6 @@ typedef struct testdef { static testdef_t tests[] = { { "alpha", "clipper", "", "PCI:" }, - { "avr", "sample", "", "T", sizeof(bios_avr), NULL, bios_avr }, { "avr", "arduino-duemilanove", "", "T", sizeof(bios_avr), NULL, bios_avr }, { "avr", "arduino-mega-2560-v3", "", "T", sizeof(bios_avr), NULL, bios_avr}, { "ppc", "ppce500", "", "U-Boot" }, diff --git a/hw/avr/Kconfig b/hw/avr/Kconfig index 7907584ac7..59d9649d27 100644 --- a/hw/avr/Kconfig +++ b/hw/avr/Kconfig @@ -7,7 +7,3 @@ config ATMEL_ATMEGA_MCU config ARDUINO select ATMEL_ATMEGA_MCU select UNIMP - -config AVR_SAMPLE - select ATMEL_ATMEGA_MCU - select UNIMP diff --git a/hw/avr/Makefile.objs b/hw/avr/Makefile.objs index b36ca77cf0..f6aab1438d 100644 --- a/hw/avr/Makefile.objs +++ b/hw/avr/Makefile.objs @@ -1,3 +1,2 @@ obj-$(CONFIG_ATMEL_ATMEGA_MCU) += atmel_atmega.o obj-$(CONFIG_ARDUINO) += arduino.o -obj-$(CONFIG_AVR_SAMPLE) += sample.o From patchwork Mon Jan 20 22:01:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 1226150 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amsat.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=B3aEGOZw; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 481mDT1GqLz9sR0 for ; Tue, 21 Jan 2020 09:14:33 +1100 (AEDT) Received: from localhost ([::1]:44714 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1itfJW-0000qH-88 for incoming@patchwork.ozlabs.org; Mon, 20 Jan 2020 17:14:30 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:51171) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1itf73-0001rY-8O for qemu-devel@nongnu.org; Mon, 20 Jan 2020 17:01:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1itf72-0005zn-35 for qemu-devel@nongnu.org; Mon, 20 Jan 2020 17:01:37 -0500 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]:33760) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1itf71-0005zZ-Sv for qemu-devel@nongnu.org; Mon, 20 Jan 2020 17:01:36 -0500 Received: by mail-wm1-x330.google.com with SMTP id d139so794641wmd.0 for ; Mon, 20 Jan 2020 14:01:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=KDkVC2+bOrjkb5KBMB6fZY6qUfAQU9/xqCnC4Kii7iM=; b=B3aEGOZwYe8EFpsAuUgcK+D9yUCqaZKkn2l2qfIqfsAn6R0jF22vB5SbdyO8m8/HbD Xt4vyWK0vmKZUup2jMg4wB4dxO6qQpcIG36PNaauhVS7+f6BUnQ4AjBv61QDACcMdB6o A9VcUU0eYEewpBworRWmMwVC0A3SI+IIVwLRptMvyzJFZ2QlhRbiaAqA9Ghn+jlMT/BR bTf5tafz8fZMhdNXXoI3DbtzxFNxjEZNmoyD2HJT6/9Gau9NjM13Mq3Rk718pmzR5Ji2 vo791ki6TsgLkpOrvelayTBc4mMZ8ayd+eI97vEAhetjXMq9umjBSfrnLsp8B5dagBaM 90gw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=KDkVC2+bOrjkb5KBMB6fZY6qUfAQU9/xqCnC4Kii7iM=; b=isq9Tm1PfwJGtmzTlhjcfW1e931aR8eexcxG7+4TYGNPraO1kgB5UEvMdDhpeWwT2/ CCPFXePhWBvqfBLOswYUMXHguIx/4Cq4SqKngw1rmZ2ZtaxeLEh+w1yd7RqtZqt0bggm 8jiizptAzRIwz25YpjNvmijzYo/1Mvbi4c/Sdi+5t9viaQbm5VaOjxqiJcxF43g5LfDS RtVJQznRMvee2skfTEOtpRNwZhI1ergXGyQch6C4fURavtUehiqOZfDwJFBBTck+QOnf yRCBRuRLVpaqi5HUhFDc0xgU+4+VPcysOAKAze5VliuINQvwQcej4+hq3tgtQb2WNlT4 Zraw== X-Gm-Message-State: APjAAAWvgTOfayY8N+Koa1/Owf/meU/QAjoRx8o11liyZSZ5FKqd/OcG MSumARZcHA3i2dC3dCtmuAttOX+Z X-Google-Smtp-Source: APXvYqz8txA8LyQSzmwqahQMF1TTkKkQDD0a13NQQNgWNJ8SO/NAQPiEnHku/kVYF7LH6/D2C4p+Qg== X-Received: by 2002:a05:600c:2c13:: with SMTP id q19mr876418wmg.144.1579557694730; Mon, 20 Jan 2020 14:01:34 -0800 (PST) Received: from x1w.redhat.com (113.red-83-57-172.dynamicip.rima-tde.net. [83.57.172.113]) by smtp.gmail.com with ESMTPSA id f1sm904341wmc.45.2020.01.20.14.01.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Jan 2020 14:01:34 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v4 18/18] .travis.yml: Run the AVR acceptance tests Date: Mon, 20 Jan 2020 23:01:07 +0100 Message-Id: <20200120220107.17825-19-f4bug@amsat.org> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200120220107.17825-1-f4bug@amsat.org> References: <20200120220107.17825-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::330 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , Sarah Harris , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Michael Rolnik , =?utf-8?q?Alex_Benn=C3=A9e?= , Aleksandar Markovic , Richard Henderson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" We have one test so far, and it is very fast: $ avocado --show=app run -t arch:avr tests/acceptance/ (1/1) tests/acceptance/machine_avr6.py:AVR6Machine.test_freertos: PASS (2.13 s) RESULTS : PASS 1 | ERROR 0 | FAIL 0 | SKIP 0 | WARN 0 | INTERRUPT 0 | CANCEL 0 JOB TIME : 2.30 s Signed-off-by: Philippe Mathieu-Daudé --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6c1038a0f1..2301c9221e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -268,7 +268,7 @@ matrix: # Acceptance (Functional) tests - env: - - CONFIG="--python=/usr/bin/python3 --target-list=x86_64-softmmu,mips-softmmu,mips64el-softmmu,aarch64-softmmu,arm-softmmu,s390x-softmmu,alpha-softmmu,ppc-softmmu,ppc64-softmmu,m68k-softmmu,sparc-softmmu" + - CONFIG="--python=/usr/bin/python3 --target-list=x86_64-softmmu,mips-softmmu,mips64el-softmmu,aarch64-softmmu,arm-softmmu,s390x-softmmu,alpha-softmmu,ppc-softmmu,ppc64-softmmu,m68k-softmmu,sparc-softmmu,avr-softmmu" - TEST_CMD="make check-acceptance" after_script: - python3 -c 'import json; r = json.load(open("tests/results/latest/results.json")); [print(t["logfile"]) for t in r["tests"] if t["status"] not in ("PASS", "SKIP")]' | xargs cat