From owner-dev-commits-src-all@freebsd.org Sat Aug 7 18:28:26 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 85CFC66F2DE; Sat, 7 Aug 2021 18:28:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GhrSp2KMRz4ZVx; Sat, 7 Aug 2021 18:28:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 22C3825D59; Sat, 7 Aug 2021 18:28:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 177ISQh4082599; Sat, 7 Aug 2021 18:28:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 177ISQja082598; Sat, 7 Aug 2021 18:28:26 GMT (envelope-from git) Date: Sat, 7 Aug 2021 18:28:26 GMT Message-Id: <202108071828.177ISQja082598@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 6e162bd2f298 - main - riscv: Add NVMe, USB and HID support to GENERIC MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6e162bd2f298b58a418a17d49f5671a9a113fc4e Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Aug 2021 18:28:26 -0000 The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=6e162bd2f298b58a418a17d49f5671a9a113fc4e commit 6e162bd2f298b58a418a17d49f5671a9a113fc4e Author: Jessica Clarke AuthorDate: 2021-08-07 18:27:33 +0000 Commit: Jessica Clarke CommitDate: 2021-08-07 18:27:33 +0000 riscv: Add NVMe, USB and HID support to GENERIC The SiFive FU740 has both NVMe and USB so we need both to ensure we can mount root, and HID is a dependency of USB. Reviewed by: kp MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D31036 --- sys/riscv/conf/GENERIC | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/sys/riscv/conf/GENERIC b/sys/riscv/conf/GENERIC index 09882853ada2..ae7f1c166273 100644 --- a/sys/riscv/conf/GENERIC +++ b/sys/riscv/conf/GENERIC @@ -90,6 +90,10 @@ device riscv_syscon # Bus drivers device pci +# Block devices +device scbus +device da + # VirtIO support device virtio # Generic VirtIO bus (required) device virtio_pci # VirtIO PCI device @@ -97,6 +101,25 @@ device vtnet # VirtIO Ethernet device device virtio_blk # VirtIO Block device device virtio_mmio # VirtIO MMIO bus +# NVM Express (NVMe) support +device nvme # base NVMe driver +options NVME_USE_NVD=0 # prefer the cam(4) based nda(4) driver +device nvd # expose NVMe namespaces as disks, depends on nvme + +# USB support +options USB_DEBUG # enable debug msgs +device ohci # OHCI USB interface +device uhci # UHCI USB interface +device ehci # EHCI USB interface (USB 2.0) +device xhci # XHCI USB interface (USB 3.0) +device usb # USB Bus (required) +device ukbd # Keyboard +device umass # Disks/Mass storage - Requires scbus and da + +# HID support +options HID_DEBUG # enable debug msgs +device hid # Generic HID support + # DTrace support # device dtrace # device dtrace_profile