From owner-svn-src-all@freebsd.org Sat Sep 9 20:02:07 2017 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 85B33E06AFB for ; Sat, 9 Sep 2017 20:02:07 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-io0-x22a.google.com (mail-io0-x22a.google.com [IPv6:2607:f8b0:4001:c06::22a]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 3EFC876F4D for ; Sat, 9 Sep 2017 20:02:07 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-io0-x22a.google.com with SMTP id i14so11373456ioe.2 for ; Sat, 09 Sep 2017 13:02:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc; bh=jp1q6kOGjVT3NXidsb+bPLZNpzq1OvQ1cGmFGwbZaUM=; b=QczmXrayYywQzwqBZJWhU+NCSXTsMBXpQKnCnTIYRTkyM8tQNjqrmiithgQ+dEBNDu 6ficjs4gnjI9zIs9mRV5vPslMnwfdb8cQKNJHwlgq+CER02agRIYK43ahUNWPNcEkb6Q UPHDq2Ad82cCMjtIf8WjsHWq5Zc0/XJiOYZH+GUri+WH3/3cXnt9G84f8QHUS+zed10/ HsbTIqy4GgS6ixEyu79fZvFlJpkWvzppv1yGDEugG8o8BWpHt7CYH0qNjaXZj6FIFm0Q 9qOyTljcf1JsKufKOEY9+xCyXouyFLCnlf2Ee2r51D5JIZIVFnqEaSB63a4NDZXPgqnA xJtA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc; bh=jp1q6kOGjVT3NXidsb+bPLZNpzq1OvQ1cGmFGwbZaUM=; b=Uif0c3uqdQQT7rQtMolBn87ozxBpXMFn6NXQ65+/h/jWmDMfcpWRHDkX6BL4XsiUbD vyS7fhQCH18deekok/4JJGa6YhPLIsOUgkr2LZuVqVgkSU9yDE6uJEIRF05k1wGA59A7 4NpG5M1Wib+4UZuXSKmS6L03lIDUhJ6Clc+PlMWF/E+6/r8C0SjqWqiuDD5d654VVQ+e kVwMj0l+PEbRclzbZNTngPwpmWtc6uWEIcfPaDPHTRUDxfp+t/5978rLtMIV/P+AGtVL 4qAGaz1RNsDAxaDDrRWTGfvkWEkVxOA+9C1IARJtWNQ2/xt7weRJdu+d23Pw70/tF9MQ S9yA== X-Gm-Message-State: AHPjjUhYxWO312aejmjEHIJT3bqHADTSwSRhsqOev3RFMdQpBnAwUTOp GetH05SL0tCE0Vt5JqazCt1rv243d2uc X-Google-Smtp-Source: AOwi7QBZoXjs47fPu5ODTpOyHognGH8dBOM5xw7WKjTcnSUWeczKqw1WpAwa9AvrJHLWYzdT+fjCRBcbUrtTyCyo0og= X-Received: by 10.107.7.161 with SMTP id g33mr8655859ioi.169.1504987326494; Sat, 09 Sep 2017 13:02:06 -0700 (PDT) MIME-Version: 1.0 Sender: wlosh@bsdimp.com Received: by 10.79.10.71 with HTTP; Sat, 9 Sep 2017 13:02:05 -0700 (PDT) X-Originating-IP: [2603:300b:6:5100:d5ae:f1f3:42c8:b0f7] In-Reply-To: <67e6ff1d-e552-7b3a-e1ea-4e21867d7602@freebsd.org> References: <201709091919.v89JJE8Z075009@repo.freebsd.org> <67e6ff1d-e552-7b3a-e1ea-4e21867d7602@freebsd.org> From: Warner Losh Date: Sat, 9 Sep 2017 14:02:05 -0600 X-Google-Sender-Auth: yMDM2SZuvAQ1U2WQ-MRpNJWFbLg Message-ID: Subject: Re: svn commit: r323371 - head/sys/conf To: Sean Bruno Cc: src-committers , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.23 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Sep 2017 20:02:07 -0000 On Sat, Sep 9, 2017 at 1:57 PM, Sean Bruno wrote: > > > On 09/09/17 13:51, Warner Losh wrote: > > > > > > On Sat, Sep 9, 2017 at 1:19 PM, Sean Bruno > > wrote: > > > > Author: sbruno > > Date: Sat Sep 9 19:19:13 2017 > > New Revision: 323371 > > URL: https://svnweb.freebsd.org/changeset/base/323371 > > > > > > Log: > > r323359 instroduced an ARMv8 only uart(4) device to the tree but > > placed > > the driver in a place where it will be built for all targets. x86 > > doesn't > > have all the required build bits for this device. > > > > Move the uart(4) device mvebu to arm64 only. > > > > Modified: > > head/sys/conf/files > > head/sys/conf/files.arm64 > > > > Modified: head/sys/conf/files > > ============================================================ > ================== > > --- head/sys/conf/files Sat Sep 9 18:39:55 2017 (r323370) > > +++ head/sys/conf/files Sat Sep 9 19:19:13 2017 (r323371) > > @@ -3053,7 +3053,6 @@ dev/uart/uart_bus_puc.c optional > > uart puc > > dev/uart/uart_bus_scc.c optional uart scc > > dev/uart/uart_core.c optional uart > > dev/uart/uart_dbg.c optional uart gdb > > -dev/uart/uart_dev_mvebu.c optional uart uart_mvebu > > dev/uart/uart_dev_ns8250.c optional uart uart_ns8250 | uart > > uart_snps > > dev/uart/uart_dev_pl011.c optional uart pl011 > > dev/uart/uart_dev_quicc.c optional uart quicc > > > > Modified: head/sys/conf/files.arm64 > > ============================================================ > ================== > > --- head/sys/conf/files.arm64 Sat Sep 9 18:39:55 2017 > > (r323370) > > +++ head/sys/conf/files.arm64 Sat Sep 9 19:19:13 2017 > > (r323371) > > @@ -176,6 +176,7 @@ dev/pci/pci_host_generic_fdt.c optional > > pci fdt > > dev/psci/psci.c optional psci > > dev/psci/psci_arm64.S optional psci > > dev/uart/uart_cpu_arm64.c optional uart > > +dev/uart/uart_dev_mvebu.c optional uart uart_mvebu > > dev/uart/uart_dev_pl011.c optional uart pl011 > > dev/usb/controller/dwc_otg_hisi.c optional dwcotg fdt > > soc_hisi_hi6220 > > dev/usb/controller/ehci_mv.c optional ehci_mv fdt > > > > > > This is a bad change since we may support running the mvebu in 32-bit > > mode, in which case we'd need it duplicated. > > > > There's no harm in it being in the global files file, as it won't show > > up automatically. > > > > Warner > > > > > I moved it around like this to unbreak the x86 build. > > I see explicit restrictions on the header inclusion in sys/modules/uart > that would keep this from compiling on x86 and caused the breakage. > > I don't see an obvious way to get this device to build on 32bit and > 64bit arm (unless files.arm is included automagically). > > Does this make sense? > No. -dev/uart/uart_dev_mvebu.c optional uart uart_mvebu This should only be enabled in kernel configs that have both 'uart' AND 'uart_mvebu' in them. What enabled uart_mvebu? I don't see it in GENERIC. Warner