From owner-svn-src-head@freebsd.org Tue Jun 11 11:16:43 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EB9EF15B7660; Tue, 11 Jun 2019 11:16:42 +0000 (UTC) (envelope-from luporl@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 91A99874F0; Tue, 11 Jun 2019 11:16:42 +0000 (UTC) (envelope-from luporl@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 69918CA3; Tue, 11 Jun 2019 11:16:42 +0000 (UTC) (envelope-from luporl@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x5BBGgFQ014835; Tue, 11 Jun 2019 11:16:42 GMT (envelope-from luporl@FreeBSD.org) Received: (from luporl@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x5BBGgtE014834; Tue, 11 Jun 2019 11:16:42 GMT (envelope-from luporl@FreeBSD.org) Message-Id: <201906111116.x5BBGgtE014834@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: luporl set sender to luporl@FreeBSD.org using -f From: Leandro Lupori Date: Tue, 11 Jun 2019 11:16:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r348899 - head/sys/powerpc/ofw X-SVN-Group: head X-SVN-Commit-Author: luporl X-SVN-Commit-Paths: head/sys/powerpc/ofw X-SVN-Commit-Revision: 348899 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 91A99874F0 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.96)[-0.957,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Jun 2019 11:16:43 -0000 Author: luporl Date: Tue Jun 11 11:16:41 2019 New Revision: 348899 URL: https://svnweb.freebsd.org/changeset/base/348899 Log: [PPC64] Fix ofw_initrd Before this change, OFW initrd (as md) handling code was simulating an ofwbus device. But as there isn't really a Device Tree (DT) node representing OFW initrd (it is specified in 2 properties under /chosen), its driver was in fact stealing other driver's DT node. This was noticed after MD_ROOT_MEM became default and QEMU's USB keyboard stopped working under VNC. This change consists in simplifying the process of detection and mapping of initrd memory, turning it into a simple startup step, instead of trying to simulate a device. Reviewed by: jhibbits Differential Revision: https://reviews.freebsd.org/D20553 Modified: head/sys/powerpc/ofw/ofw_initrd.c Modified: head/sys/powerpc/ofw/ofw_initrd.c ============================================================================== --- head/sys/powerpc/ofw/ofw_initrd.c Tue Jun 11 10:41:39 2019 (r348898) +++ head/sys/powerpc/ofw/ofw_initrd.c Tue Jun 11 11:16:41 2019 (r348899) @@ -43,71 +43,41 @@ __FBSDID("$FreeBSD$"); #include "opt_md.h" -#ifdef MD_ROOT_MEM extern u_char *mfs_root; -extern uint32_t mfs_root_size; -#else -#warning "MD_ROOT_MEM should be set to use ofw initrd as a md device" -#endif +extern int mfs_root_size; -/* bus entry points */ -static int ofw_initrd_probe(device_t dev); -static int ofw_initrd_attach(device_t dev); -static void ofw_initrd_identify(driver_t *driver, device_t parent); +static void ofw_initrd_probe_and_attach(void *junk); -struct ofw_initrd_softc { - device_t sc_dev; - vm_paddr_t start; - vm_paddr_t end; -}; +SYSINIT(ofw_initrd_probe_and_attach, SI_SUB_KMEM, SI_ORDER_ANY, + ofw_initrd_probe_and_attach, NULL); -static int -ofw_initrd_probe(device_t dev) +static void +ofw_initrd_probe_and_attach(void *junk) { phandle_t chosen; - - /* limit this device to one unit */ - if (device_get_unit(dev) != 0) - return (ENXIO); - - chosen = OF_finddevice("/chosen"); - if (chosen <= 0) { - return (ENXIO); - } - - if (!OF_hasprop(chosen, "linux,initrd-start") || - !OF_hasprop(chosen, "linux,initrd-end")) - return (ENXIO); - - device_set_desc(dev, "OFW initrd memregion loader"); - return (BUS_PROBE_DEFAULT); -} - -static int -ofw_initrd_attach(device_t dev) -{ - struct ofw_initrd_softc *sc; vm_paddr_t start, end; - phandle_t chosen; pcell_t cell[2]; ssize_t size; - sc = device_get_softc(dev); + if (!hw_direct_map) + return; chosen = OF_finddevice("/chosen"); - if (chosen <= 0) { - device_printf(dev, "/chosen not found\n"); - return (ENXIO); - } + if (chosen <= 0) + return; + if (!OF_hasprop(chosen, "linux,initrd-start") || + !OF_hasprop(chosen, "linux,initrd-end")) + return; + size = OF_getencprop(chosen, "linux,initrd-start", cell, sizeof(cell)); if (size == 4) start = cell[0]; else if (size == 8) start = (uint64_t)cell[0] << 32 | cell[1]; else { - device_printf(dev, "Wrong linux,initrd-start size\n"); - return (ENXIO); + printf("ofw_initrd: Wrong linux,initrd-start size\n"); + return; } size = OF_getencprop(chosen, "linux,initrd-end", cell, sizeof(cell)); @@ -116,44 +86,15 @@ ofw_initrd_attach(device_t dev) else if (size == 8) end = (uint64_t)cell[0] << 32 | cell[1]; else{ - device_printf(dev, "Wrong linux,initrd-end size\n"); - return (ENXIO); + printf("ofw_initrd: Wrong linux,initrd-end size\n"); + return; } if (end - start > 0) { mfs_root = (u_char *) PHYS_TO_DMAP(start); mfs_root_size = end - start; - - return (0); + printf("ofw_initrd: initrd loaded at 0x%08lx-0x%08lx\n", + start, end); } - - return (ENXIO); } -static void -ofw_initrd_identify(driver_t *driver, device_t parent) -{ - if (device_find_child(parent, "initrd", -1) != NULL) - return; - - if (BUS_ADD_CHILD(parent, 10, "initrd", -1) == NULL) - device_printf(parent, "add ofw_initrd child failed\n"); -} - -static device_method_t ofw_initrd_methods[] = { - DEVMETHOD(device_identify, ofw_initrd_identify), - DEVMETHOD(device_probe, ofw_initrd_probe), - DEVMETHOD(device_attach, ofw_initrd_attach), - DEVMETHOD_END -}; - -static driver_t ofw_initrd_driver = { - "ofw_initrd", - ofw_initrd_methods, - sizeof(struct ofw_initrd_softc) -}; - -static devclass_t ofw_initrd_devclass; - -DRIVER_MODULE(ofw_initrd, ofwbus, ofw_initrd_driver, ofw_initrd_devclass, - NULL, NULL);