From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 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,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 59210C433B4 for ; Sat, 15 May 2021 17:48:44 +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 08A88613AF for ; Sat, 15 May 2021 17:48:43 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 08A88613AF Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:57966 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lhyP5-0003EQ-21 for qemu-devel@archiver.kernel.org; Sat, 15 May 2021 13:48:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48312) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lhyEj-0000tF-PE for qemu-devel@nongnu.org; Sat, 15 May 2021 13:38:01 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:35801) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lhyEh-0006M8-4p for qemu-devel@nongnu.org; Sat, 15 May 2021 13:38:01 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1621100276; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=j4+TVOwKdNAqEwx0iSQEx6F6DQNpYYiD4MSDoIPJ8ns=; b=C1y5DnAt2Jit4pcFE1rQFAK+D5SmsB7CrEXGZZKR3Nta2vx0NBsM1G75YArD+G/FOk4d1u Jqyh7LmZ9E3r66s+OqL4ERQiIKAmxusqEpAXt95tj4CbV+83WLdHu9BJDCEcm313D5v1l2 ngX/jHGdXiPk5eN3QhhsbDzr0IbQBM0= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-304-QnWAhKcJO1GlEgc15OY56Q-1; Sat, 15 May 2021 13:37:55 -0400 X-MC-Unique: QnWAhKcJO1GlEgc15OY56Q-1 Received: by mail-wm1-f71.google.com with SMTP id b128-20020a1c1b860000b029015b52bdb65aso1656087wmb.5 for ; Sat, 15 May 2021 10:37:55 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=j4+TVOwKdNAqEwx0iSQEx6F6DQNpYYiD4MSDoIPJ8ns=; b=kmiALSLVYmP42beoFA3ZoAAN+eEH2oS1V3HMKLB1ZtdszErJTi31dWVYplCbUprY7r nupZqh2KgGZHXOWBbwg5kLwU04I9X+9dU0kR0E81Xm0kd85MBBACUylmNhsRXwdSX84f QwM374jHCOQ+8GmBgqb50iLVtlWG9/1XHxysjR0Im79GMUMZpgSKN8r1QMuvHy8NhfWb hSX+Ej6k3kXkQfl2sJPSEweUxL7CFe2XgND6dawB0J4m3XgyM5NACHsASBLdLCn7OZoX Lze9FR/I4rCBsm+DP2mLzK0vj//bIfEXJdIIlBKuVBWyjvCk2uJV4XP6MJT1f2wxIpa8 Oz3Q== X-Gm-Message-State: AOAM5306xEn4xnNRfs4czs69w0oZ4gvI2I5wa3oagbMVP78bqoOjzDvD Uhyqbf25khiozSGqW+J+8azy+mc8lb39U+R6NZOJM0T0o7kaqAgYjhyRafCcHyzJxyd3gNoWD7m dsxB2ZOO5dd4RZr0NLUBHb8LT4SYgSI4DCkrmvqMzypmFKbhYYkkhypRmDcGxd/eu X-Received: by 2002:a05:6000:508:: with SMTP id a8mr65107218wrf.315.1621100272374; Sat, 15 May 2021 10:37:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxoFnLeRbk63Gsa5dVBOmEyZbu2HTopi5mLBkLvvTphYvDhVQD1hqnm/7wQOXQ6OyOFZn0rTw== X-Received: by 2002:a05:6000:508:: with SMTP id a8mr65107196wrf.315.1621100272196; Sat, 15 May 2021 10:37:52 -0700 (PDT) Received: from localhost.localdomain (31.red-83-51-215.dynamicip.rima-tde.net. [83.51.215.31]) by smtp.gmail.com with ESMTPSA id x16sm10269543wrp.6.2021.05.15.10.37.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 15 May 2021 10:37:51 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 07/12] hw/riscv/Kconfig: Restrict NUMA to Virt & Spike machines Date: Sat, 15 May 2021 19:37:11 +0200 Message-Id: <20210515173716.358295-8-philmd@redhat.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210515173716.358295-1-philmd@redhat.com> References: <20210515173716.358295-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=170.10.133.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.701, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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: Alistair Francis , qemu-riscv@nongnu.org, Bin Meng , qemu-arm@nongnu.org, qemu-ppc@nongnu.org, Paolo Bonzini , Bin Meng , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Palmer Dabbelt , David Gibson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Only the Virt and Spike machines use NUMA. Add a RISCV_NUMA Kconfig symbol and only have these machines select it. Adapt the Meson file to only built it if required. Acked-by: Paolo Bonzini Reviewed-by: Bin Meng Signed-off-by: Philippe Mathieu-Daudé --- hw/riscv/Kconfig | 5 +++++ hw/riscv/meson.build | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/hw/riscv/Kconfig b/hw/riscv/Kconfig index 86957ec7b06..0590f443fdf 100644 --- a/hw/riscv/Kconfig +++ b/hw/riscv/Kconfig @@ -1,3 +1,6 @@ +config RISCV_NUMA + bool + config IBEX bool @@ -34,6 +37,7 @@ config RISCV_VIRT imply PCI_DEVICES imply VIRTIO_VGA imply TEST_DEVICES + select RISCV_NUMA select GOLDFISH_RTC select MSI_NONBROKEN select PCI @@ -74,6 +78,7 @@ config SIFIVE_U config SPIKE bool + select RISCV_NUMA select HTIF select MSI_NONBROKEN select SIFIVE_CLINT diff --git a/hw/riscv/meson.build b/hw/riscv/meson.build index a97454661c0..ab6cae57eae 100644 --- a/hw/riscv/meson.build +++ b/hw/riscv/meson.build @@ -1,6 +1,6 @@ riscv_ss = ss.source_set() riscv_ss.add(files('boot.c'), fdt) -riscv_ss.add(files('numa.c')) +riscv_ss.add(when: 'CONFIG_RISCV_NUMA', if_true: files('numa.c')) riscv_ss.add(files('riscv_hart.c')) riscv_ss.add(when: 'CONFIG_OPENTITAN', if_true: files('opentitan.c')) riscv_ss.add(when: 'CONFIG_RISCV_VIRT', if_true: files('virt.c')) -- 2.26.3 From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1lhyEl-00010k-Eu for mharc-qemu-riscv@gnu.org; Sat, 15 May 2021 13:38:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48294) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lhyEj-0000r5-5j for qemu-riscv@nongnu.org; Sat, 15 May 2021 13:38:01 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:23506) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lhyEe-0006M3-Uu for qemu-riscv@nongnu.org; Sat, 15 May 2021 13:38:00 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1621100276; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=j4+TVOwKdNAqEwx0iSQEx6F6DQNpYYiD4MSDoIPJ8ns=; b=C1y5DnAt2Jit4pcFE1rQFAK+D5SmsB7CrEXGZZKR3Nta2vx0NBsM1G75YArD+G/FOk4d1u Jqyh7LmZ9E3r66s+OqL4ERQiIKAmxusqEpAXt95tj4CbV+83WLdHu9BJDCEcm313D5v1l2 ngX/jHGdXiPk5eN3QhhsbDzr0IbQBM0= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-599-ruavRYByNy-G_-Rl1fQrxg-1; Sat, 15 May 2021 13:37:54 -0400 X-MC-Unique: ruavRYByNy-G_-Rl1fQrxg-1 Received: by mail-wm1-f69.google.com with SMTP id h129-20020a1c21870000b02901743c9f70b9so444161wmh.6 for ; Sat, 15 May 2021 10:37:54 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=j4+TVOwKdNAqEwx0iSQEx6F6DQNpYYiD4MSDoIPJ8ns=; b=rom1vnj59DHL+jE3jLgrDJ/8/mJWp26R20ge5JozRpLNRTKnU3LYfZB0jx0QOWfN8g 53PdVS2fbr+SypVB9UWl86Vmn8RuV/LN21u1BurWxsKzJ53ayV+JtJfuXVaVw7dMrJPc dTXKsP5MT2+6wR1uzd1ljZIZ7okldY6C3oUl27kXIaIlcznugYgiu4kOPDg+bl2KDGtF nD14YN+e11o+KwYWw2qXTfrIiraNClc3nABo8sfkxJ7Mstr/bqHG6AR6EzJ6f0t+VjvA lJWnAk25tQasvG/Yo60uQrexaHNdpSsWpmsXDWzx63S/NrkB/WgPdWh9hiFMO+SksiRo 1e0g== X-Gm-Message-State: AOAM530wPE8+ZsjcaGkqRkgJlyxwLDlAlaXlIlxkrJ+ak9dd4iYMOcjq wI3b1JuT0ylTN7BEoOO21VJmYSoX/rmYiawSx6b7lOc7RlPf6JpqKHN+GSenBX1ke/xzUtiRxgY ARaVGqLNf806ycSU= X-Received: by 2002:a05:6000:508:: with SMTP id a8mr65107208wrf.315.1621100272292; Sat, 15 May 2021 10:37:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxoFnLeRbk63Gsa5dVBOmEyZbu2HTopi5mLBkLvvTphYvDhVQD1hqnm/7wQOXQ6OyOFZn0rTw== X-Received: by 2002:a05:6000:508:: with SMTP id a8mr65107196wrf.315.1621100272196; Sat, 15 May 2021 10:37:52 -0700 (PDT) Received: from localhost.localdomain (31.red-83-51-215.dynamicip.rima-tde.net. [83.51.215.31]) by smtp.gmail.com with ESMTPSA id x16sm10269543wrp.6.2021.05.15.10.37.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 15 May 2021 10:37:51 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Bin Meng , Paolo Bonzini , qemu-riscv@nongnu.org, qemu-arm@nongnu.org, qemu-ppc@nongnu.org, BALATON Zoltan , David Gibson , Alistair Francis , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Bin Meng , Palmer Dabbelt Subject: [PATCH v2 07/12] hw/riscv/Kconfig: Restrict NUMA to Virt & Spike machines Date: Sat, 15 May 2021 19:37:11 +0200 Message-Id: <20210515173716.358295-8-philmd@redhat.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210515173716.358295-1-philmd@redhat.com> References: <20210515173716.358295-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.701, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-riscv@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 May 2021 17:38:01 -0000 Only the Virt and Spike machines use NUMA. Add a RISCV_NUMA Kconfig symbol and only have these machines select it. Adapt the Meson file to only built it if required. Acked-by: Paolo Bonzini Reviewed-by: Bin Meng Signed-off-by: Philippe Mathieu-Daudé --- hw/riscv/Kconfig | 5 +++++ hw/riscv/meson.build | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/hw/riscv/Kconfig b/hw/riscv/Kconfig index 86957ec7b06..0590f443fdf 100644 --- a/hw/riscv/Kconfig +++ b/hw/riscv/Kconfig @@ -1,3 +1,6 @@ +config RISCV_NUMA + bool + config IBEX bool @@ -34,6 +37,7 @@ config RISCV_VIRT imply PCI_DEVICES imply VIRTIO_VGA imply TEST_DEVICES + select RISCV_NUMA select GOLDFISH_RTC select MSI_NONBROKEN select PCI @@ -74,6 +78,7 @@ config SIFIVE_U config SPIKE bool + select RISCV_NUMA select HTIF select MSI_NONBROKEN select SIFIVE_CLINT diff --git a/hw/riscv/meson.build b/hw/riscv/meson.build index a97454661c0..ab6cae57eae 100644 --- a/hw/riscv/meson.build +++ b/hw/riscv/meson.build @@ -1,6 +1,6 @@ riscv_ss = ss.source_set() riscv_ss.add(files('boot.c'), fdt) -riscv_ss.add(files('numa.c')) +riscv_ss.add(when: 'CONFIG_RISCV_NUMA', if_true: files('numa.c')) riscv_ss.add(files('riscv_hart.c')) riscv_ss.add(when: 'CONFIG_OPENTITAN', if_true: files('opentitan.c')) riscv_ss.add(when: 'CONFIG_RISCV_VIRT', if_true: files('virt.c')) -- 2.26.3