From patchwork Thu Apr 22 09:19:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Robinson X-Patchwork-Id: 1469129 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=l39gZE2z; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4FQsLl1L7dz9sVw for ; Thu, 22 Apr 2021 19:19:27 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 357EF82B59; Thu, 22 Apr 2021 11:19:24 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="l39gZE2z"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 7102482B59; Thu, 22 Apr 2021 11:19:23 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mail-wr1-x42b.google.com (mail-wr1-x42b.google.com [IPv6:2a00:1450:4864:20::42b]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 2330182B5A for ; Thu, 22 Apr 2021 11:19:20 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=pbrobinson@gmail.com Received: by mail-wr1-x42b.google.com with SMTP id c15so35088965wro.13 for ; Thu, 22 Apr 2021 02:19:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=HT12sGs0CM3itQCUvAzw9sDruH/9Yp55PBG/JE+QExQ=; b=l39gZE2zJcHJ6qLd3opbV2hUdpjLjv5ECXYSuSx29hFZDwvry/VaLder2NslfTe4j/ 8wa7RgWJlhBbvCrUM6fQhiHAz/v3cwuVaA97vQAHvXHa25N2rYlMD0CM33h4HnPWneaz cjfFasB6NNv+8lVvy85/zh/lYm/jrz3KmA0Uo4aS54AYRw0Fn7qF0FXQEh1X5ZmptTru +bxeI+Qu7NM8MtgdOfeRUqQxrOzu0PdJwiyBbX6SDm6rmoEpPn6ZJMnYFBTrxR/Ncagt jg2EbEgZ7K30XDaAGhF5r6p4pjcEkSUu0Asbfz8gJESrAsFeSs2CIHlLdTb3+IEXgHpE m/1g== 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:mime-version :content-transfer-encoding; bh=HT12sGs0CM3itQCUvAzw9sDruH/9Yp55PBG/JE+QExQ=; b=dkxBsIw9kmoZkNSVEMIiwlH2heXseAOPcgVtIFOIkqhoYQVOD8uRcUaLCRxP+YZCNa aMI1gEC4lfU8pN2wjJmbZ53cT7B76aok0Jc6ogY7M7RvvAA/AR3HXj8T2zzmVkE6oX52 ILY5fevJepDzy2SaHESrZfOTjftnDE+BQn2iQQwBALC4mzrEt5cFTRtDB3dG9ZyCIQ8s tr+QmhQrqwRigmgYaCDk1MJsTmoTK1GfoRS+KXygcTC2pyH+taIag+UAV5lelXtcXgIQ upmIvQDakKtDYH8g/wzsbbs+nMgR8V9hA6BdEuWj2wK4eYimihXJtAsfWCl4il6w4xlY YPxw== X-Gm-Message-State: AOAM533wQAii0ESm4v360ZiQ0Rraumrk+hRBtxxoMFeyZlRv9C/Om3rB 6LSgT+1dsSEL8/vbNvhqI0g= X-Google-Smtp-Source: ABdhPJwIjZUEideOGHaj29DyKQCbOn7xMKI5rbZ0KaK8nF7WNXTvtrhwLl1vML4Bw6/kIQ97J1gOPg== X-Received: by 2002:adf:f106:: with SMTP id r6mr2831671wro.214.1619083159705; Thu, 22 Apr 2021 02:19:19 -0700 (PDT) Received: from morpheus.roving-it.com.com (f.c.9.1.f.e.c.d.1.e.0.0.2.b.5.5.1.8.6.2.1.1.b.f.0.b.8.0.1.0.0.2.ip6.arpa. [2001:8b0:fb11:2681:55b2:e1:dcef:19cf]) by smtp.googlemail.com with ESMTPSA id i15sm2592042wrr.73.2021.04.22.02.19.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Apr 2021 02:19:19 -0700 (PDT) From: Peter Robinson To: Marek Vasut , u-boot@lists.denx.de Cc: Peter Robinson , Nicolas Saenz Julienne , Andy Shevchenko Subject: [PATCH] Revert "usb: kbd: destroy device after console is stopped" Date: Thu, 22 Apr 2021 10:19:10 +0100 Message-Id: <20210422091910.83560-1-pbrobinson@gmail.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.4 at phobos.denx.de X-Virus-Status: Clean Reverts commit eb5fd9e46c1, it causes ARMv7 devices to stop booting Linux when a USB keyboard is attached. The kernels starts but there's no output. Reverting it makes things work again. Signed-off-by: Peter Robinson Cc: Nicolas Saenz Julienne Cc: Andy Shevchenko --- This has caused us issues on a number of ARMv7 deviices. I'm not sure why specifically ARMv7 because it happens on a RPi3 running Fedora armhfp, but doesn't happen on aarch64. Issue seen on RPis, Cubietruck, and others. common/usb_kbd.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/common/usb_kbd.c b/common/usb_kbd.c index afad260d3d..515f37136f 100644 --- a/common/usb_kbd.c +++ b/common/usb_kbd.c @@ -622,12 +622,12 @@ int usb_kbd_deregister(int force) if (dev) { usb_kbd_dev = (struct usb_device *)dev->priv; data = usb_kbd_dev->privptr; + if (stdio_deregister_dev(dev, force) != 0) + return 1; #if CONFIG_IS_ENABLED(CONSOLE_MUX) - if (iomux_replace_device(stdin, DEVNAME, force ? "nulldev" : "")) + if (iomux_doenv(stdin, env_get("stdin")) != 0) return 1; #endif - if (stdio_deregister_dev(dev, force) != 0) - return 1; #ifdef CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE destroy_int_queue(usb_kbd_dev, data->intq); #endif @@ -665,16 +665,16 @@ static int usb_kbd_remove(struct udevice *dev) goto err; } data = udev->privptr; + if (stdio_deregister_dev(sdev, true)) { + ret = -EPERM; + goto err; + } #if CONFIG_IS_ENABLED(CONSOLE_MUX) - if (iomux_replace_device(stdin, DEVNAME, "nulldev")) { + if (iomux_doenv(stdin, env_get("stdin"))) { ret = -ENOLINK; goto err; } #endif - if (stdio_deregister_dev(sdev, true)) { - ret = -EPERM; - goto err; - } #ifdef CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE destroy_int_queue(udev, data->intq); #endif