From patchwork Mon Feb 22 14:15:07 2021 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: 12098751 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 63D8AC433DB for ; Mon, 22 Feb 2021 14:20:24 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id ED43764DB1 for ; Mon, 22 Feb 2021 14:20:23 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org ED43764DB1 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:45376 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lEC4U-00077W-VU for qemu-devel@archiver.kernel.org; Mon, 22 Feb 2021 09:20:22 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:44266) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lEBzh-00038X-FI; Mon, 22 Feb 2021 09:15:25 -0500 Received: from mail-ed1-x529.google.com ([2a00:1450:4864:20::529]:33186) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lEBzf-000157-Qr; Mon, 22 Feb 2021 09:15:25 -0500 Received: by mail-ed1-x529.google.com with SMTP id c6so22228020ede.0; Mon, 22 Feb 2021 06:15: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=dmBDOSPHUBsxt7wUc+IzchJdmMa5xMeP6klvWD3BkNU=; b=XBlLiYxD2EJfxWNpRZBng0ZIdOp4qk33dyAzgNzZzfVW+xwAvgFt/ShlKWZi798xLh VpmSVn2gPatrPrsB79AT+Av+7CGv4Gv72d+EjTtbf79kEebkjkX/EBz6hax1/DrdRELo clNDnVXoX/SsvXz/Yx4a6sp4BeVMyDNqG+Lawocy5ynSppj7uLnU5VFFKFip+EwRB9XE Cxlrp17NbHaesuc/Pw7/IaVAqY0R24rfBZoVJzq8o/+W1Bvny+FkwdCaIaWqqDF5khyA 95Y92i3N0ODzc5QW+blNgdHzfyDAMiLKMIi7S30qGYMxX3SNML75Q89oRHX9DUoVoLl5 IiYQ== 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=dmBDOSPHUBsxt7wUc+IzchJdmMa5xMeP6klvWD3BkNU=; b=NM1kihHaFXrCvx2EqnzO8OrdcYKFdjHnZS3oHtWfG+53fgVdawMwdHCGkC20VgukbE Pa1WTbQ/tAe94pI1EpO8CTaTlUimSUwUBaccyq42ustxWwjYhoEArpT0OqR2eoehaxIi uOjR5jdBQZw0kUE7jV1t6SxeRB5d4qS/R0kdGpcQqjV58Xdg7ytoSz9n8k1ugLJrIp1+ daUWIiv2KrXeol2W7HNwBHWeVTHU1qvOAxwdSn4TZ6GI8wNP2/j6vq4igYIBzX2rIZWB nUiGuzEAijxOC32kRrQ+g7JL84BOoPAUM9PmIjy9c+z60KAYAxgxCAOtzdFzkdaqNUhY da6Q== X-Gm-Message-State: AOAM530x5BOw9lQ3tDqpQa+gc2Tg9ZbwgQmgZF5+mKjnvYtZXFtpk7R5 Tcd1BzmN2zxi0VRp7yf5IqrYHYJ2+MM= X-Google-Smtp-Source: ABdhPJziDjxtZpxDg1Ril4L97/MhhjkqfjiasGnoFsCz0bpnF8pdm7CssmpTNCq10QS+YXIeVgvrbQ== X-Received: by 2002:a05:6402:34c1:: with SMTP id w1mr22960384edc.147.1614003321656; Mon, 22 Feb 2021 06:15:21 -0800 (PST) Received: from x1w.redhat.com (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id z22sm12096586edb.88.2021.02.22.06.15.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Feb 2021 06:15:21 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v4 1/8] hw/sh4: Add missing license Date: Mon, 22 Feb 2021 15:15:07 +0100 Message-Id: <20210222141514.2646278-2-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210222141514.2646278-1-f4bug@amsat.org> References: <20210222141514.2646278-1-f4bug@amsat.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::529; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ed1-x529.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action 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: Kevin Wolf , Peter Maydell , Yoshinori Sato , qemu-block@nongnu.org, Magnus Damm , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Max Reitz , Samuel Tardieu , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" This code was introduced in commit 27c7ca7e775, ("SHIX board emulation (Samuel Tardieu)"). Use the same license. Cc: Samuel Tardieu Signed-off-by: Philippe Mathieu-Daudé --- include/hw/sh4/sh.h | 31 ++++++++++++++++++++++++++++--- hw/block/tc58128.c | 26 ++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 3 deletions(-) diff --git a/include/hw/sh4/sh.h b/include/hw/sh4/sh.h index 93f464bf4cd..becb5969790 100644 --- a/include/hw/sh4/sh.h +++ b/include/hw/sh4/sh.h @@ -1,6 +1,31 @@ -#ifndef QEMU_SH_H -#define QEMU_SH_H -/* Definitions for SH board emulation. */ +/* + * Definitions for SH board emulation + * + * Copyright (c) 2005 Samuel Tardieu + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + * + * SPDX-License-Identifier: MIT + */ +#ifndef QEMU_HW_SH_H +#define QEMU_HW_SH_H #include "hw/sh4/sh_intc.h" #include "target/sh4/cpu-qom.h" diff --git a/hw/block/tc58128.c b/hw/block/tc58128.c index 9888f01ac60..bfc27ad8993 100644 --- a/hw/block/tc58128.c +++ b/hw/block/tc58128.c @@ -1,3 +1,29 @@ +/* + * TC58128 NAND EEPROM emulation + * + * Copyright (c) 2005 Samuel Tardieu + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + * + * SPDX-License-Identifier: MIT + */ #include "qemu/osdep.h" #include "qemu/units.h" #include "hw/sh4/sh.h" From patchwork Mon Feb 22 14:15:08 2021 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: 12098775 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 44D5FC433DB for ; Mon, 22 Feb 2021 14:22:32 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 67E8164DB1 for ; Mon, 22 Feb 2021 14:22:31 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 67E8164DB1 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:49684 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lEC6Y-0000Yc-Bo for qemu-devel@archiver.kernel.org; Mon, 22 Feb 2021 09:22:30 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:44316) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lEBzq-0003LA-7o; Mon, 22 Feb 2021 09:15:34 -0500 Received: from mail-ej1-x632.google.com ([2a00:1450:4864:20::632]:39430) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lEBzl-0001AR-0P; Mon, 22 Feb 2021 09:15:30 -0500 Received: by mail-ej1-x632.google.com with SMTP id t11so29586599ejx.6; Mon, 22 Feb 2021 06:15:28 -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=9hmeNcCuV50+4mklzG6lWCfHgecZ1fCI3uUrwmRLWxc=; b=ET6xO0M6IVLiy08b4hX1Abe+AfP3kvEOGkw17hjXYHhTjZPYBpWx4xe2TfIU2GYmdX 54m5rvBNS9ojHz2t8/CfELxhPWILLdphaXOwl95xeRPS1zetwirqqJqlV/HTb2gttKtn krZUZ9pKelG66B2B+kwjU2JxW1S2lDLHD6zBKxhrG2xeKoR2rPw4ff5uThTDWEZEmfdp X9SYLXsvPGrItfxlkUmvGIcZ0x9JF1nPpXsQj0Uq7Ebf//WVTCADG6fgseLTImPUc8tZ fPX8pyWv2T0Efiplj4y5beTidsBkP5Umc5homtd/4f2Z/gbw69w/XSaX0EAQADuRxi/y fJYw== 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=9hmeNcCuV50+4mklzG6lWCfHgecZ1fCI3uUrwmRLWxc=; b=bHzxaCM4Q4k6OM1d/8v0JowYTS/fAH97DlJa9kYfTDuPyRVJ9dMe/01ghkVOHHxB9h tzcYKSo4qad3CuQy/KXDNudChTZq3ShQd4OXQi7fvuSuRM8+XNu0UIEwTp7vCE+XO72R lzUOr2HoIoMqjzM0ujB75BhSJOovvVxzp1csarpcmzK63X7lQ3TpmM2Fm4lZ8iBy86rW g1IqA7s+f7kzpnFd6OBAzCJF8mNdZvIzB6DvODDplnEIPJkjQnj7Lvy9M6LtU9W1dyOy M6MQAmPRlzx4p0UST1HcRP3Ejjfg9iMveU18/l8O+uERNfXz3PUK3e/MztY+3SR+Asca o/Kw== X-Gm-Message-State: AOAM5306zMyK6fl38pmfvhnJ56v3NelLx2EeNJvwlzaqitggRS/3k+lp 2vOHAoyDC87h4KXZsObrDgZ95k/78fE= X-Google-Smtp-Source: ABdhPJwjpU2FeKnKcWr5oiJIAVTCf6/YZHwAaTdtgQJQcPXJzy72rEfolw1rLp8Ej8cazr3oMWG9Fw== X-Received: by 2002:a17:906:5453:: with SMTP id d19mr18610360ejp.150.1614003326990; Mon, 22 Feb 2021 06:15:26 -0800 (PST) Received: from x1w.redhat.com (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id v13sm12381457ede.5.2021.02.22.06.15.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Feb 2021 06:15:26 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v4 2/8] hw/sh4: Add missing Kconfig dependency on SH7750 for the R2D board Date: Mon, 22 Feb 2021 15:15:08 +0100 Message-Id: <20210222141514.2646278-3-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210222141514.2646278-1-f4bug@amsat.org> References: <20210222141514.2646278-1-f4bug@amsat.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::632; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ej1-x632.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action 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: Kevin Wolf , Peter Maydell , Yoshinori Sato , qemu-block@nongnu.org, Magnus Damm , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Max Reitz , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" r2d_init() calls sh7750_init() so depends on SH7750.Harmless at the moment because nothing actually uses CONFIG_SH7750 (hw/sh4/meson.build always compiles sh7750.c and sh7750_regnames.c unconditionally). Fixes: 7ab58d4c841 ("sh4-softmmu.mak: express dependencies with Kconfig") Reported-by: Peter Maydell Reviewed-by: Peter Maydell Signed-off-by: Philippe Mathieu-Daudé --- hw/sh4/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/sh4/Kconfig b/hw/sh4/Kconfig index 4cbce3a0ed5..0452b4624ae 100644 --- a/hw/sh4/Kconfig +++ b/hw/sh4/Kconfig @@ -10,6 +10,7 @@ config R2D select PCI select SM501 select SH4 + select SH7750 config SHIX bool From patchwork Mon Feb 22 14:15:09 2021 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: 12098777 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A1E4BC433DB for ; Mon, 22 Feb 2021 14:23:39 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 043E164D99 for ; Mon, 22 Feb 2021 14:23:38 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 043E164D99 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:52140 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lEC7d-0001aX-T5 for qemu-devel@archiver.kernel.org; Mon, 22 Feb 2021 09:23:37 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:44364) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lEBzt-0003PJ-9f; Mon, 22 Feb 2021 09:15:37 -0500 Received: from mail-ed1-x530.google.com ([2a00:1450:4864:20::530]:39961) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lEBzq-0001Dy-T8; Mon, 22 Feb 2021 09:15:36 -0500 Received: by mail-ed1-x530.google.com with SMTP id q10so22145693edt.7; Mon, 22 Feb 2021 06:15: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=AhAmFnOhivCLWQNmcu5zh+TK35CPBEArBmFuQg4srh8=; b=mMh1h4nZ3Ybbh5dCRYn4OKv3g1lrvR/ILwgy6a6lTXh/pu0pW2tLLlZUeUfuGtxtF6 3jlrqZAVXp+Tz3a/p+WjgrxgDB2vMzbmD6e4uzNmZ8CFJfulzsQrN++P3+f+mjVzohL4 N4KQx/MUmaeJ4ouN5nslJcLmQduOitof5EjV/gOrdZAMtSf9N8Swlo1zP0o8PIeJgPn1 90VvAXmdAUKZ+g1gc/r8SAWpDuhUnMVyM7/Q9bYf353K0vVTMcBNjGUloTiD7wZaBoU7 Hiq5zen2nrrmHsnlbcOh2H2SSCIm60ps7Y9ZTOrd85ijqAdX2AnX4Dszs7jJbzVuCZK3 3tpg== 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=AhAmFnOhivCLWQNmcu5zh+TK35CPBEArBmFuQg4srh8=; b=LPMsXsXuTI1euWveQ3q8agf7GUu77eG981XaRSW4+YX2sdKFdGCctdM29cWsuSRH7g Tybj3VyJLgSkk9wh7saTe2OtMx8qipacxWAxuWxM2emPvtKT9FPDdiYxWYwvkAbhWbwo YGQqwwS+1MMaAQ8/5DD1xvcSQovn2y8jDRllik1G2ZOWty1OH9/ueOHGRA4RN9W+aBel F/8RsVYqRK6FG+WvpPpb4BTIrha7kAOJVMfIpMBzAiHdEkEBNjHJj9EkKtUmdiu5w3yK ohIS/eblCQo0/NdVI7pb/PXp1op/4Eu0FY69m5WKyY5+cs9FF5Jrc+xQ+b2WZpvVgI5N 8eJw== X-Gm-Message-State: AOAM531+W/RLggUqGbssOs+kcUsxZGz1bszovY0S3D9RJZxVTME5TYE9 fawWUQ1cHFKu2gLMJNmcvnsUba6pI6I= X-Google-Smtp-Source: ABdhPJw9sS/NS6tVAOZD7ukjPQCKOL3A4JuJXXOCpBZytD+nZoUSWTjtxFrWWr7sdD/Ux1iWmiUypA== X-Received: by 2002:a50:ee16:: with SMTP id g22mr23936112eds.235.1614003332936; Mon, 22 Feb 2021 06:15:32 -0800 (PST) Received: from x1w.redhat.com (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id b17sm10500470ejj.9.2021.02.22.06.15.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Feb 2021 06:15:32 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v4 3/8] hw/intc: Introduce SH_INTC Kconfig entry Date: Mon, 22 Feb 2021 15:15:09 +0100 Message-Id: <20210222141514.2646278-4-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210222141514.2646278-1-f4bug@amsat.org> References: <20210222141514.2646278-1-f4bug@amsat.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::530; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ed1-x530.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action 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: Kevin Wolf , Peter Maydell , Yoshinori Sato , qemu-block@nongnu.org, Magnus Damm , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Max Reitz , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" We want to be able to use the 'SH4' config for architecture specific features. Add more fine-grained selection by adding a CONFIG_SH_INTC selector for the SH4 interrupt controller. Suggested-by: Peter Maydell Reviewed-by: Peter Maydell Signed-off-by: Philippe Mathieu-Daudé --- hw/intc/Kconfig | 3 +++ hw/intc/meson.build | 2 +- hw/sh4/Kconfig | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/hw/intc/Kconfig b/hw/intc/Kconfig index c18d11142a8..66bf0b90b47 100644 --- a/hw/intc/Kconfig +++ b/hw/intc/Kconfig @@ -53,6 +53,9 @@ config OMPIC config PPC_UIC bool +config SH_INTC + bool + config RX_ICU bool diff --git a/hw/intc/meson.build b/hw/intc/meson.build index 53cba115690..b3d9345a0d2 100644 --- a/hw/intc/meson.build +++ b/hw/intc/meson.build @@ -47,7 +47,7 @@ specific_ss.add(when: 'CONFIG_RX_ICU', if_true: files('rx_icu.c')) specific_ss.add(when: 'CONFIG_S390_FLIC', if_true: files('s390_flic.c')) specific_ss.add(when: 'CONFIG_S390_FLIC_KVM', if_true: files('s390_flic_kvm.c')) -specific_ss.add(when: 'CONFIG_SH4', if_true: files('sh_intc.c')) +specific_ss.add(when: 'CONFIG_SH_INTC', if_true: files('sh_intc.c')) specific_ss.add(when: 'CONFIG_SIFIVE_CLINT', if_true: files('sifive_clint.c')) specific_ss.add(when: 'CONFIG_SIFIVE_PLIC', if_true: files('sifive_plic.c')) specific_ss.add(when: 'CONFIG_XICS', if_true: files('xics.c')) diff --git a/hw/sh4/Kconfig b/hw/sh4/Kconfig index 0452b4624ae..c2008c6a0d2 100644 --- a/hw/sh4/Kconfig +++ b/hw/sh4/Kconfig @@ -19,6 +19,7 @@ config SHIX config SH7750 bool + select SH_INTC config SH4 bool From patchwork Mon Feb 22 14:15:10 2021 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: 12098779 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0CE40C433DB for ; Mon, 22 Feb 2021 14:24:43 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 6171964D99 for ; Mon, 22 Feb 2021 14:24:42 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6171964D99 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:54230 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lEC8f-0002Yy-Ch for qemu-devel@archiver.kernel.org; Mon, 22 Feb 2021 09:24:41 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:44386) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lEBzx-0003Wd-Si; Mon, 22 Feb 2021 09:15:41 -0500 Received: from mail-ed1-x531.google.com ([2a00:1450:4864:20::531]:34361) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lEBzw-0001Jd-Bf; Mon, 22 Feb 2021 09:15:41 -0500 Received: by mail-ed1-x531.google.com with SMTP id j9so22195479edp.1; Mon, 22 Feb 2021 06:15:39 -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=Mxqq1fIETdh/e8tcYC6fmyKoJfUnWAtkX7IT6VSa4RM=; b=B4AtEjrnAdfaIGiqZDLStCrNC8GREspQCY00XC6WUFFSZqalxRy7ZPSA3BgOOIJWHN gizOHuRDRwvs3pKPbTF2+OYQeHjQlz/XlB0kxLY2X7Ugv8CqSXPR2bmtG6c8xMimrJUI 1IIihjIH62vxo63NfcwByPuL4JXT+okLiktyQgdECmkqXSyLF+6PLty6F7Gh17d9IxHk ZaGtsoLeJb7BX8dC6IP3OH2AcVM7cAOGPs0T9r8E16yEGGnbfBGuf+Lhsyhn5xpbP/Lg Y93CPBx6amyvcpXUE35TO49H4s6vC7GhgZBFNNPpGIPDU5QAoHHnK+hsGM5bYpiyekXU eblA== 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=Mxqq1fIETdh/e8tcYC6fmyKoJfUnWAtkX7IT6VSa4RM=; b=F4xWtWR5+NbuRaVrgwXAlijePpTbps99R1DGmNkJh/zF6XLoIDPG/yWjI+Dw2ZJocj N7XuYsmqn/wRhsKdLvItngS6PBJy/aQo/jjEUWbQ/i7dVZuamsuVVVVTtai3NguCUnk6 g0xS9/NZyhhlzp7NLrhQDcn6II651QatDd0f/2zXQfLS5E0kmYDFtdQiHeHwCaHZTWML IgfXB8Kzw7E6Bjvpep/OCK+0nQJjS2IdNi6ZaNKE/jKsB6c6CNs9dWsMFCI1t274U/UJ sU0gx8ecf4SH0gEorOOuSyjH12KJlIQKmfVfaYiKU4ehMZu4sROPJoW4tLAOs1jtPj+a YsGQ== X-Gm-Message-State: AOAM531d+G9Qb//UXVvvqsXPxdvhWcVqRCycbwH5/dRkmBpN1V/OVmlO ca5wUtdla01y26o/RKyxGiCV6mKHTVk= X-Google-Smtp-Source: ABdhPJxlb8ZgyRagiGklqOhzm1tClYC85Bc0cPnt8NeOlQPWnpwSZ81nwGIHf4uQv77p4nnUJvjiqw== X-Received: by 2002:aa7:ce99:: with SMTP id y25mr22312671edv.167.1614003338447; Mon, 22 Feb 2021 06:15:38 -0800 (PST) Received: from x1w.redhat.com (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id g24sm10595553edq.43.2021.02.22.06.15.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Feb 2021 06:15:38 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v4 4/8] hw/char: Introduce SH_SCI Kconfig entry Date: Mon, 22 Feb 2021 15:15:10 +0100 Message-Id: <20210222141514.2646278-5-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210222141514.2646278-1-f4bug@amsat.org> References: <20210222141514.2646278-1-f4bug@amsat.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::531; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ed1-x531.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action 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: Kevin Wolf , Peter Maydell , Yoshinori Sato , qemu-block@nongnu.org, Magnus Damm , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Max Reitz , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" We want to be able to use the 'SH4' config for architecture specific features. Add more fine-grained selection by adding a CONFIG_SH_SCI selector for the SH4 serial controller. Add the missing MAINTAINERS entries. Suggested-by: Peter Maydell Reviewed-by: Peter Maydell Signed-off-by: Philippe Mathieu-Daudé --- MAINTAINERS | 2 ++ hw/char/Kconfig | 3 +++ hw/char/meson.build | 2 +- hw/sh4/Kconfig | 1 + 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index 9b2aa18e1fe..b53a937714a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1388,6 +1388,7 @@ R2D M: Yoshinori Sato R: Magnus Damm S: Odd Fixes +F: hw/char/sh_serial.c F: hw/sh4/r2d.c F: hw/intc/sh_intc.c F: include/hw/sh4/sh_intc.h @@ -1396,6 +1397,7 @@ Shix M: Yoshinori Sato R: Magnus Damm S: Odd Fixes +F: hw/char/sh_serial.c F: hw/sh4/shix.c F: hw/intc/sh_intc.c F: include/hw/sh4/sh_intc.h diff --git a/hw/char/Kconfig b/hw/char/Kconfig index 939bc447588..f6f4fffd1b7 100644 --- a/hw/char/Kconfig +++ b/hw/char/Kconfig @@ -50,6 +50,9 @@ config SCLPCONSOLE config TERMINAL3270 bool +config SH_SCI + bool + config RENESAS_SCI bool diff --git a/hw/char/meson.build b/hw/char/meson.build index 196ac91fa29..afe9a0af88c 100644 --- a/hw/char/meson.build +++ b/hw/char/meson.build @@ -31,7 +31,7 @@ softmmu_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2835_aux.c')) softmmu_ss.add(when: 'CONFIG_RENESAS_SCI', if_true: files('renesas_sci.c')) softmmu_ss.add(when: 'CONFIG_SIFIVE_UART', if_true: files('sifive_uart.c')) -softmmu_ss.add(when: 'CONFIG_SH4', if_true: files('sh_serial.c')) +softmmu_ss.add(when: 'CONFIG_SH_SCI', if_true: files('sh_serial.c')) softmmu_ss.add(when: 'CONFIG_STM32F2XX_USART', if_true: files('stm32f2xx_usart.c')) softmmu_ss.add(when: 'CONFIG_MCHP_PFSOC_MMUART', if_true: files('mchp_pfsoc_mmuart.c')) diff --git a/hw/sh4/Kconfig b/hw/sh4/Kconfig index c2008c6a0d2..47240aa97b7 100644 --- a/hw/sh4/Kconfig +++ b/hw/sh4/Kconfig @@ -20,6 +20,7 @@ config SHIX config SH7750 bool select SH_INTC + select SH_SCI config SH4 bool From patchwork Mon Feb 22 14:15:11 2021 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: 12098749 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3EC6EC433DB for ; Mon, 22 Feb 2021 14:18:50 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id EE57864DB1 for ; Mon, 22 Feb 2021 14:18:49 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EE57864DB1 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:42178 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lEC2y-0005mr-V7 for qemu-devel@archiver.kernel.org; Mon, 22 Feb 2021 09:18:48 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:44424) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lEC04-0003e8-35; Mon, 22 Feb 2021 09:15:50 -0500 Received: from mail-ej1-x633.google.com ([2a00:1450:4864:20::633]:46514) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lEC01-0001LX-Jr; Mon, 22 Feb 2021 09:15:47 -0500 Received: by mail-ej1-x633.google.com with SMTP id r17so3246718ejy.13; Mon, 22 Feb 2021 06:15:44 -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=8NQxzvw/rLDcJlmgmZNjYJ+dqWkqgHbVTMWeNA+d6sI=; b=LV5fuJFbP0bzckaxjC0Y4PKvN3Z2pJmy5CUQCxrZbTyoAneTWb2X93H2GjYeHSYXek NXlCzh30aBHki9hI43X+nQ561ga7DXo54YVPFY612woox24E/smzfwdPRXpplx4uS5/G cuqwSxTEMnTBxudiuMnKSxhO7Vpr7LAfFT842qzQjPn6rbiDc7jCOVXLryT8Xh82Jpak Amm8EYjm0sIK3yV2YS+tbYo2Np8bRYx4k1SlgH1yCD9vTeuNkMFAtTPXFh2jyNXsGNEE n1sMrFeZPmqoHXPBD5zZ1qbX79MDEnBHaCwstC2fUY6FcJDJH10UhgiEiNJxcn5wibAK rXtg== 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=8NQxzvw/rLDcJlmgmZNjYJ+dqWkqgHbVTMWeNA+d6sI=; b=VaiKGrMeDE90PrPAS7zqOPdfUJ+4FfjFzhwByi8hGFsQVINciE1Rh/lwJjfxs1LyK4 xdCvfTDiwYpIkO7F9+GRWEY/JtTBnzLfLhrKY91PdXqJchGBwVw1KQ2+5B7+PtWe59bW IauPEPCLVaHAEKh1QrHDLPQlBtUhfNbGlG0G0/CcuGTl4LpGacq7AJLg4u+qrhWkHdu8 Kyr5iKHIizTkX6pRBYZRkhiKauiPpNrm7lN84/WyBrywGvdhlfYRZNbYRJdWkjXT6UrE sgr/q8FA7s2rI12U5YJEUAsjLqHmsq8OSFZDcRiwn3M/7TdNnY4UFYhU0tms6b7C89RY o22A== X-Gm-Message-State: AOAM5326sLu5HNRf2ejR+XB66UM2yOSgwdYII35MujmeUIGaDmbDF4UO +O9yajpG9TUHVGPwycMgoFJ1NvcEK6g= X-Google-Smtp-Source: ABdhPJyFeeRMdSjLmSCuX2+pw2XUoR+EWcgA9uqO2//Sw1DC+CyIoBwp8FPTccGWALLyMECJ1H1tHw== X-Received: by 2002:a17:906:43d7:: with SMTP id j23mr20924571ejn.519.1614003343694; Mon, 22 Feb 2021 06:15:43 -0800 (PST) Received: from x1w.redhat.com (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id w24sm11633219edu.2.2021.02.22.06.15.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Feb 2021 06:15:43 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v4 5/8] hw/timer: Introduce SH_TIMER Kconfig entry Date: Mon, 22 Feb 2021 15:15:11 +0100 Message-Id: <20210222141514.2646278-6-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210222141514.2646278-1-f4bug@amsat.org> References: <20210222141514.2646278-1-f4bug@amsat.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::633; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ej1-x633.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action 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: Kevin Wolf , Peter Maydell , Yoshinori Sato , qemu-block@nongnu.org, Magnus Damm , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Max Reitz , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" We want to be able to use the 'SH4' config for architecture specific features. Add more fine-grained selection by adding a CONFIG_SH_TIMER selector for the SH4 timer control unit. Add the missing MAINTAINERS entries. Suggested-by: Peter Maydell Reviewed-by: Peter Maydell Signed-off-by: Philippe Mathieu-Daudé --- MAINTAINERS | 2 ++ hw/sh4/Kconfig | 2 +- hw/timer/Kconfig | 4 ++++ hw/timer/meson.build | 2 +- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index b53a937714a..a03557f4f7c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1391,6 +1391,7 @@ S: Odd Fixes F: hw/char/sh_serial.c F: hw/sh4/r2d.c F: hw/intc/sh_intc.c +F: hw/timer/sh_timer.c F: include/hw/sh4/sh_intc.h Shix @@ -1400,6 +1401,7 @@ S: Odd Fixes F: hw/char/sh_serial.c F: hw/sh4/shix.c F: hw/intc/sh_intc.c +F: hw/timer/sh_timer.c F: include/hw/sh4/sh_intc.h SPARC Machines diff --git a/hw/sh4/Kconfig b/hw/sh4/Kconfig index 47240aa97b7..e569470a614 100644 --- a/hw/sh4/Kconfig +++ b/hw/sh4/Kconfig @@ -21,7 +21,7 @@ config SH7750 bool select SH_INTC select SH_SCI + select SH_TIMER config SH4 bool - select PTIMER diff --git a/hw/timer/Kconfig b/hw/timer/Kconfig index 8749edfb6a5..18936ef55bf 100644 --- a/hw/timer/Kconfig +++ b/hw/timer/Kconfig @@ -36,6 +36,10 @@ config CMSDK_APB_DUALTIMER bool select PTIMER +config SH_TIMER + bool + select PTIMER + config RENESAS_TMR bool diff --git a/hw/timer/meson.build b/hw/timer/meson.build index be343f68fed..26c2701fd78 100644 --- a/hw/timer/meson.build +++ b/hw/timer/meson.build @@ -30,7 +30,7 @@ softmmu_ss.add(when: 'CONFIG_PUV3', if_true: files('puv3_ost.c')) softmmu_ss.add(when: 'CONFIG_PXA2XX', if_true: files('pxa2xx_timer.c')) softmmu_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2835_systmr.c')) -softmmu_ss.add(when: 'CONFIG_SH4', if_true: files('sh_timer.c')) +softmmu_ss.add(when: 'CONFIG_SH_TIMER', if_true: files('sh_timer.c')) softmmu_ss.add(when: 'CONFIG_SLAVIO', if_true: files('slavio_timer.c')) softmmu_ss.add(when: 'CONFIG_STM32F2XX_TIMER', if_true: files('stm32f2xx_timer.c')) softmmu_ss.add(when: 'CONFIG_XILINX', if_true: files('xilinx_timer.c')) From patchwork Mon Feb 22 14:15:12 2021 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: 12098785 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C50A3C433DB for ; Mon, 22 Feb 2021 14:26:58 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 5025B64DF0 for ; Mon, 22 Feb 2021 14:26:58 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5025B64DF0 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:58552 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lECAr-0004uD-AH for qemu-devel@archiver.kernel.org; Mon, 22 Feb 2021 09:26:57 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:44456) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lEC0A-0003jm-55; Mon, 22 Feb 2021 09:15:58 -0500 Received: from mail-ed1-x52b.google.com ([2a00:1450:4864:20::52b]:43270) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lEC07-0001OQ-3R; Mon, 22 Feb 2021 09:15:53 -0500 Received: by mail-ed1-x52b.google.com with SMTP id d2so22081292edq.10; Mon, 22 Feb 2021 06:15:50 -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=7hp9J4XlTFMOgSc10T5wq2uqS5gyz7FKlM3WI8mfVyY=; b=S4mPBzjcKzRRKyAdAa+0353S3VJ0sWtOHo4WZcFQ4AyC09wn5qMlYPVLd4Rlj7BG5i 1WHFPycXRf3xjh53YVYDnD5QRP8Q5xM3Y0xnVPVCak1gCbOd6nIa07c1ed+ZVaa0KbVk Vm5dGzlzv145xYE4QwjN3dKlAQWyXG9/a/Tl8BKxby0NdbzkC8ZgJzkUumZlEiNtzX7E 7QU4YCTaeenyTETFio5aal97TKvicUwcteUzOCF+2XLc7mr++5ao54buvOnk9oJj4vqi x0viOrrESBu3EqUmHMVZeXIZS6RNdG79C5o8cd0X6nQ9GM++uc3AVa2bDtCgWodZ+fro VYHQ== 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=7hp9J4XlTFMOgSc10T5wq2uqS5gyz7FKlM3WI8mfVyY=; b=HzAiucawgr8bji+xVUpCjvi/AqEQKllnzhWIYSViAXpOp8Hp6IrGI2N7Ja603mt69G 6tyoFd59vdGLm6kqvoqtoKsZCq3JOxYdNPFRmGBDYFP3Pk6CHRADTpYRUaO1qLI3JL1w dfjCDNvbKov4oXOFqp25wnnMu4Ewbo8SuAAPjIGv7nOugid4pjRE934mBcHFI4UvGZM6 RjxTB+8wSfEO3yJsGvYuL6WpUZoGmsR4vDQ0msJ7qy3cmpky8YWceusxAgrOyg4DV5xR HAkhKF86WlhKoA61fB7U+Ctw4JURntGGHGzpf2q4f3QxOrHHy2LWq//l51zTn60MTdAx NQAQ== X-Gm-Message-State: AOAM533nIkKSnReBr5qs/HlFpeu2EafuFjFyzDDKMmpPjJr0r/em29R7 wwoe4yZmfbCLNUwYimLPwtVJZqKcmbM= X-Google-Smtp-Source: ABdhPJynDoqtorc63NNrUTyxCuQDuIUGaWXUUAoxDilYi+a+ItuTlBeNDvIk5w1W9F4CaxkjPxgprA== X-Received: by 2002:a05:6402:605:: with SMTP id n5mr22736603edv.128.1614003349231; Mon, 22 Feb 2021 06:15:49 -0800 (PST) Received: from x1w.redhat.com (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id d3sm12480088edk.82.2021.02.22.06.15.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Feb 2021 06:15:48 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v4 6/8] hw/block: Introduce TC58128 eeprom Kconfig entry Date: Mon, 22 Feb 2021 15:15:12 +0100 Message-Id: <20210222141514.2646278-7-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210222141514.2646278-1-f4bug@amsat.org> References: <20210222141514.2646278-1-f4bug@amsat.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::52b; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ed1-x52b.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action 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: Kevin Wolf , Peter Maydell , Yoshinori Sato , qemu-block@nongnu.org, Magnus Damm , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Max Reitz , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Add more fine-grained selection by adding a CONFIG_TC58128 selector for the TC58128 eeprom. As this device is only used by the Shix machine, add an entry to the proper section in MAINTAINERS. Suggested-by: Peter Maydell Reviewed-by: Peter Maydell Signed-off-by: Philippe Mathieu-Daudé --- MAINTAINERS | 1 + hw/block/Kconfig | 3 +++ hw/block/meson.build | 2 +- hw/sh4/Kconfig | 1 + 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index a03557f4f7c..a0cb89161cb 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1398,6 +1398,7 @@ Shix M: Yoshinori Sato R: Magnus Damm S: Odd Fixes +F: hw/block/tc58128.c F: hw/char/sh_serial.c F: hw/sh4/shix.c F: hw/intc/sh_intc.c diff --git a/hw/block/Kconfig b/hw/block/Kconfig index 2d17f481adc..4fcd1521668 100644 --- a/hw/block/Kconfig +++ b/hw/block/Kconfig @@ -22,6 +22,9 @@ config ECC config ONENAND bool +config TC58128 + bool + config NVME_PCI bool default y if PCI_DEVICES diff --git a/hw/block/meson.build b/hw/block/meson.build index 602ca6c8541..4bf994c64ff 100644 --- a/hw/block/meson.build +++ b/hw/block/meson.build @@ -12,7 +12,7 @@ softmmu_ss.add(when: 'CONFIG_SSI_M25P80', if_true: files('m25p80.c')) softmmu_ss.add(when: 'CONFIG_SWIM', if_true: files('swim.c')) softmmu_ss.add(when: 'CONFIG_XEN', if_true: files('xen-block.c')) -softmmu_ss.add(when: 'CONFIG_SH4', if_true: files('tc58128.c')) +softmmu_ss.add(when: 'CONFIG_TC58128', if_true: files('tc58128.c')) softmmu_ss.add(when: 'CONFIG_NVME_PCI', if_true: files('nvme.c', 'nvme-ns.c')) specific_ss.add(when: 'CONFIG_VIRTIO_BLK', if_true: files('virtio-blk.c')) diff --git a/hw/sh4/Kconfig b/hw/sh4/Kconfig index e569470a614..34c01dadde9 100644 --- a/hw/sh4/Kconfig +++ b/hw/sh4/Kconfig @@ -16,6 +16,7 @@ config SHIX bool select SH7750 select SH4 + select TC58128 config SH7750 bool From patchwork Mon Feb 22 14:15:13 2021 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: 12098781 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E6B50C433E6 for ; Mon, 22 Feb 2021 14:25:56 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 933B564DF0 for ; Mon, 22 Feb 2021 14:25:56 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 933B564DF0 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:56372 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lEC9r-0003j5-NK for qemu-devel@archiver.kernel.org; Mon, 22 Feb 2021 09:25:55 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:44468) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lEC0E-0003kK-02; Mon, 22 Feb 2021 09:15:58 -0500 Received: from mail-ej1-x629.google.com ([2a00:1450:4864:20::629]:45911) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lEC0C-0001R1-G0; Mon, 22 Feb 2021 09:15:57 -0500 Received: by mail-ej1-x629.google.com with SMTP id j6so2519440eja.12; Mon, 22 Feb 2021 06:15:55 -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=Dt0TPWfRw0bUc8gL4xdOObbvdKva6Lo8lCu+ETr71Hk=; b=n6Xlc6PZ5CJvLKtZTESSyMFUU/zfypb0BdaObNmX7NcKoVzQGMD9hq9XwgBIv32Rq2 flWSIpbmBwrxuHW90ndZfE1f4AXDZ7Uf0vTYdb8IpR01ab+AYGhZXvx74di11wIf4aQM ePraXJYdg+zYwrCXTwkjPK+hlQuEiTnTyMHVQbgmzY71EVYP/GoTk65xJn6RFm8TFIse y5FPfIca9S+I9JfLBOCWpOgcJBo1tab3IaRDGlCBkgdY2LkeYIxa1llXK6oguIUrxdPU gDql3axamrfuVs1Y0Xzdyy236217+e/d7KSuQJ1wBJ0uw+FJ+3/ArZvp1yixW45oZmP5 nIYg== 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=Dt0TPWfRw0bUc8gL4xdOObbvdKva6Lo8lCu+ETr71Hk=; b=TzoW8NR6Y0LvxsozZeViRH0JESVyoO+Gi7mJpy2zYzbM4vAvhOoas2WWgCrrzFZ9OK ld1LxRl5emNNnDVh/xKsoP2003QaFd+GAKh09Swc0rkf5ixMSD9yDH6dVsNkSwwKNPIo 4HLvMmPqLlCmQTyeM2ngSSlfOO5BlIh6d9ig7nqQUMPys6N9SoTHtl6A3jTJDekqWd76 07ZOoKZBqbazSB/F9D3YjIMT8X5sma+l+wxZ3qeJAEMgrDh6P5iwON1nL6sUsZxN+Gtt QbdtaUdK/0DKKQfSgtB/d/WqPL0EPO8SLTtvcOZdPUOjeoev2h7bPsJYM2g1Scd/eeWL rKFQ== X-Gm-Message-State: AOAM530jbxHbozESDjmfiNM9TtuSwbBRZHUwy8JVKCr9R6Oz4CECS3dJ YfE03aNKPO62yJkqGDZk4SBZhPsQ7sM= X-Google-Smtp-Source: ABdhPJynYcqi1QatxIjEkXzB/cPvv/6gOAci89rFt0NzdlO2+F2Ug48nvc4u6LLtWvVwnxq/weuX8A== X-Received: by 2002:a17:906:fb1b:: with SMTP id lz27mr14216709ejb.194.1614003354604; Mon, 22 Feb 2021 06:15:54 -0800 (PST) Received: from x1w.redhat.com (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id i13sm12279889edk.38.2021.02.22.06.15.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Feb 2021 06:15:54 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v4 7/8] hw/pci-host: Introduce SH_PCI Kconfig entry Date: Mon, 22 Feb 2021 15:15:13 +0100 Message-Id: <20210222141514.2646278-8-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210222141514.2646278-1-f4bug@amsat.org> References: <20210222141514.2646278-1-f4bug@amsat.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::629; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ej1-x629.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action 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: Kevin Wolf , Peter Maydell , Yoshinori Sato , qemu-block@nongnu.org, Magnus Damm , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Max Reitz , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" We want to be able to use the 'SH4' config for architecture specific features. Add more fine-grained selection by adding a CONFIG_SH_PCI selector for the SH4 PCI controller. Move the file with the other PCI host devices in hw/pci-host and add its missing MAINTAINERS entries. Suggested-by: Peter Maydell Reviewed-by: Peter Maydell Signed-off-by: Philippe Mathieu-Daudé --- hw/{sh4 => pci-host}/sh_pci.c | 0 MAINTAINERS | 1 + hw/pci-host/Kconfig | 4 ++++ hw/pci-host/meson.build | 1 + hw/sh4/Kconfig | 1 + hw/sh4/meson.build | 1 - 6 files changed, 7 insertions(+), 1 deletion(-) rename hw/{sh4 => pci-host}/sh_pci.c (100%) diff --git a/hw/sh4/sh_pci.c b/hw/pci-host/sh_pci.c similarity index 100% rename from hw/sh4/sh_pci.c rename to hw/pci-host/sh_pci.c diff --git a/MAINTAINERS b/MAINTAINERS index a0cb89161cb..e39997f129a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1391,6 +1391,7 @@ S: Odd Fixes F: hw/char/sh_serial.c F: hw/sh4/r2d.c F: hw/intc/sh_intc.c +F: hw/pci-host/sh_pci.c F: hw/timer/sh_timer.c F: include/hw/sh4/sh_intc.h diff --git a/hw/pci-host/Kconfig b/hw/pci-host/Kconfig index 8b8c763c28c..2ccc96f02ce 100644 --- a/hw/pci-host/Kconfig +++ b/hw/pci-host/Kconfig @@ -68,3 +68,7 @@ config PCI_POWERNV config REMOTE_PCIHOST bool + +config SH_PCI + bool + select PCI diff --git a/hw/pci-host/meson.build b/hw/pci-host/meson.build index 1847c69905c..87a896973e7 100644 --- a/hw/pci-host/meson.build +++ b/hw/pci-host/meson.build @@ -10,6 +10,7 @@ pci_ss.add(when: 'CONFIG_PCI_SABRE', if_true: files('sabre.c')) pci_ss.add(when: 'CONFIG_XEN_IGD_PASSTHROUGH', if_true: files('xen_igd_pt.c')) pci_ss.add(when: 'CONFIG_REMOTE_PCIHOST', if_true: files('remote.c')) +pci_ss.add(when: 'CONFIG_SH_PCI', if_true: files('sh_pci.c')) # PPC devices pci_ss.add(when: 'CONFIG_PREP_PCI', if_true: files('prep.c')) diff --git a/hw/sh4/Kconfig b/hw/sh4/Kconfig index 34c01dadde9..b9f0538d57f 100644 --- a/hw/sh4/Kconfig +++ b/hw/sh4/Kconfig @@ -11,6 +11,7 @@ config R2D select SM501 select SH4 select SH7750 + select SH_PCI config SHIX bool diff --git a/hw/sh4/meson.build b/hw/sh4/meson.build index 303c0f42879..424d5674dea 100644 --- a/hw/sh4/meson.build +++ b/hw/sh4/meson.build @@ -2,7 +2,6 @@ sh4_ss.add(files( 'sh7750.c', 'sh7750_regnames.c', - 'sh_pci.c' )) sh4_ss.add(when: 'CONFIG_R2D', if_true: files('r2d.c')) sh4_ss.add(when: 'CONFIG_SHIX', if_true: files('shix.c')) From patchwork Mon Feb 22 14:15:14 2021 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: 12098747 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A0BBFC433E6 for ; Mon, 22 Feb 2021 14:18:20 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 0DE2B64E5C for ; Mon, 22 Feb 2021 14:18:19 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0DE2B64E5C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:41336 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lEC2U-0005S6-To for qemu-devel@archiver.kernel.org; Mon, 22 Feb 2021 09:18:18 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:44500) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lEC0J-0003us-Vq; Mon, 22 Feb 2021 09:16:04 -0500 Received: from mail-ej1-x62e.google.com ([2a00:1450:4864:20::62e]:40790) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lEC0H-0001T0-VA; Mon, 22 Feb 2021 09:16:03 -0500 Received: by mail-ej1-x62e.google.com with SMTP id u20so28917452ejb.7; Mon, 22 Feb 2021 06:16:01 -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=9ZV5S5F2neJfYXLNqhFnjIwvv5gWALmpaBVemsuVGEY=; b=p05z84/XCFPedgoAmovaYnxRcffLHPdfQxgARVlQD6r6H1kKbz4EO/IMQ1gh7PAoc6 1tDl+iGbJqKj4gj5cqbiw0ZvvtZrF0hGJXKUEL1Pkkja63TbZ09pu1MMfk8OMwG66mVf z2Q4ILN3QAVVAxvq9hpIzi291Ko+9JAtMjex37ZISmO+CEsJ/BY1qyyxs2hLQbfBORhp Vd8oSW6IxaE5lwshcqhfNIFgcFrIQSYsE5VX4rzqRPQcj6whRB/Xj0FV9yAvd9Cqqc12 sisHL8letXrvaEfY2IujwsBDdDXpMgOcGLtPjiUndSFVCRrhcnKDeACk6gvs1hsBlc4c 0pWA== 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=9ZV5S5F2neJfYXLNqhFnjIwvv5gWALmpaBVemsuVGEY=; b=OrxtSFjCMn+NQvnBz9fL8IS/r1+oQOll6ab3Df6uy+ueHOS8SnoMvVM46muQzpQ7t1 lq79+wuYN2dATkis/cKDN+gt/m7Eco75gx/KwfTIYJ01tkmwn43up/lHFX09UjoU39YS 1f6s5yXOt3UA0DYuFJ7I5c2g4jJXHJmP86iuKmMYcmNg/yP6CNbeFI0B1yDIlqxjNsqC 7jRrWWzoMJZh7azvc/wSKm3t9vVqH8lKdtHRt64vkgU8CXyAtixQwZqpm3RDdQ/NEwLV yRMl1S8PAxyEOzVu40A1Cb5SJN8a45h7RN9piFXORdkDv9UL1AkdmhwMhNHmvUvAeRKB 6UJg== X-Gm-Message-State: AOAM531YM2bOUxAUeZHq8ZzEN+8p8UcDUTgUbWJoocgFaOEAj9xi7Ekm w3qsm999FWyeS525LSk2SrUvXdNd2rE= X-Google-Smtp-Source: ABdhPJx+lg05Qtr1q7+YLDtAEmR86erFNuwrPEHCrymDhXYytqUK3SLIf0fnuHgv79rykpXDUft1vA== X-Received: by 2002:a17:906:c049:: with SMTP id bm9mr20485159ejb.535.1614003359935; Mon, 22 Feb 2021 06:15:59 -0800 (PST) Received: from x1w.redhat.com (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id c9sm8290385edt.6.2021.02.22.06.15.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Feb 2021 06:15:59 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v4 8/8] hw/sh4: Remove now unused CONFIG_SH4 from Kconfig Date: Mon, 22 Feb 2021 15:15:14 +0100 Message-Id: <20210222141514.2646278-9-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210222141514.2646278-1-f4bug@amsat.org> References: <20210222141514.2646278-1-f4bug@amsat.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::62e; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ej1-x62e.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action 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: Kevin Wolf , Peter Maydell , Yoshinori Sato , qemu-block@nongnu.org, Magnus Damm , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Max Reitz , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" As replaced the generic CONFIG_SH4 by more fine-grained selectors, we can remove this now unused config variable. Reviewed-by: Peter Maydell Signed-off-by: Philippe Mathieu-Daudé --- hw/sh4/Kconfig | 5 ----- 1 file changed, 5 deletions(-) diff --git a/hw/sh4/Kconfig b/hw/sh4/Kconfig index b9f0538d57f..ab733a3f760 100644 --- a/hw/sh4/Kconfig +++ b/hw/sh4/Kconfig @@ -9,14 +9,12 @@ config R2D select USB_OHCI_PCI select PCI select SM501 - select SH4 select SH7750 select SH_PCI config SHIX bool select SH7750 - select SH4 select TC58128 config SH7750 @@ -24,6 +22,3 @@ config SH7750 select SH_INTC select SH_SCI select SH_TIMER - -config SH4 - bool