From patchwork Thu May 9 14:15:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans de Goede X-Patchwork-Id: 13659790 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 130C8148302 for ; Thu, 9 May 2024 14:16:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715264175; cv=none; b=KNV/jrfaj+xUqD7hbdcrSJR8Ke5jNPtokRyz9RB//WCVR2G0WTranQ9PnARHPjv9IOKBpCxOHLXSsHPSFCn5tfEbjTnCB2SILc0YoZVTnxWTPxdInzh9vnvPkUo/IfcRKIwhVu8xtX5qATKW4NbmLqpF/exHkuD1MhIXIAZEsJw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715264175; c=relaxed/simple; bh=iKI8B26jQgXC1gf6sjiv7uyRRarcbvb/adEB97oymRs=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=RHPORX8WGN4nEVGK/Ilgs9lEAo+eYKsOx5yX9odDse3K/WHVacC41M2X9Owk3VhAKSXRV4/y1h4+h3ifdXH+nNYq5ScAgKzSuPhhi0ConXW4x/RbMlLNnA0KNKfTzAayVvnc2zaEiRhmvt+/Us40hHxkbr7NjArl09HNjEWSGMQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=CT27dX9z; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="CT27dX9z" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1715264173; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=pjg2PKCpdxD/auehornrq3SKgRXBrYxahB9gVsCUM2k=; b=CT27dX9z5SbC12L4vDfUoVy2HnLaKAEoO0srpZuVM8F41QK+6V5HJ7nazOqI8d8FuPs1oX 93sGuHHaN4WSagr8w8NxU6Rpx2cw06I+x6lbAKXssviIRJvtn6KrFFJwaPQTsH43WviImk DPUDdY2sDRMEUY+yVhttFMi+rzEQ3Pw= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-333-0FSzwytgP2iFufjAmQvDhw-1; Thu, 09 May 2024 10:16:03 -0400 X-MC-Unique: 0FSzwytgP2iFufjAmQvDhw-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E0E0E800206; Thu, 9 May 2024 14:15:59 +0000 (UTC) Received: from localhost.localdomain (unknown [10.39.192.19]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6E9C91C8BECC; Thu, 9 May 2024 14:15:58 +0000 (UTC) From: Hans de Goede To: Greg Kroah-Hartman , Jiri Slaby , Tony Lindgren Cc: Hans de Goede , Maximilian Luz , =?utf-8?q?Ilpo_J=C3=A4rvinen?= , Andy Shevchenko , platform-driver-x86@vger.kernel.org, linux-serial@vger.kernel.org, Weifeng Liu , Tony Lindgren , Andy Shevchenko Subject: [PATCH] serial: Clear UPF_DEAD before calling tty_port_register_device_attr_serdev() Date: Thu, 9 May 2024 16:15:49 +0200 Message-ID: <20240509141549.63704-1-hdegoede@redhat.com> Precedence: bulk X-Mailing-List: platform-driver-x86@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.7 If a serdev_device_driver is already loaded for a serdev_tty_port when it gets registered by tty_port_register_device_attr_serdev() then that driver's probe() method will be called immediately. The serdev_device_driver's probe() method should then be able to call serdev_device_open() successfully, but because UPF_DEAD is still dead serdev_device_open() will fail with -ENXIO in this scenario: serdev_device_open() ctrl->ops->open() /* this callback being ttyport_open() */ tty->ops->open() /* this callback being uart_open() */ tty_port_open() port->ops->activate() /* this callback being uart_port_activate() */ Find bit UPF_DEAD is set in uport->flags and fail with errno -ENXIO. Fix this be clearing UPF_DEAD before tty_port_register_device_attr_serdev() note this only moves up the UPD_DEAD clearing a small bit, before: tty_port_register_device_attr_serdev(); mutex_unlock(&tty_port.mutex); uart_port.flags &= ~UPF_DEAD; mutex_unlock(&port_mutex); after: uart_port.flags &= ~UPF_DEAD; tty_port_register_device_attr_serdev(); mutex_unlock(&tty_port.mutex); mutex_unlock(&port_mutex); Reported-by: Weifeng Liu Closes: https://lore.kernel.org/platform-driver-x86/20240505130800.2546640-1-weifeng.liu.z@gmail.com/ Tested-by: Weifeng Liu Signed-off-by: Hans de Goede Reviewed-by: Tony Lindgren Reviewed-by: Andy Shevchenko --- Cc: Tony Lindgren Cc: Maximilian Luz Cc: Andy Shevchenko --- drivers/tty/serial/serial_core.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c index c476d884356d..b47a277978a0 100644 --- a/drivers/tty/serial/serial_core.c +++ b/drivers/tty/serial/serial_core.c @@ -3211,6 +3211,9 @@ static int serial_core_add_one_port(struct uart_driver *drv, struct uart_port *u if (uport->attr_group) uport->tty_groups[1] = uport->attr_group; + /* Ensure serdev drivers can call serdev_device_open() right away */ + uport->flags &= ~UPF_DEAD; + /* * Register the port whether it's detected or not. This allows * setserial to be used to alter this port's parameters. @@ -3221,6 +3224,7 @@ static int serial_core_add_one_port(struct uart_driver *drv, struct uart_port *u if (!IS_ERR(tty_dev)) { device_set_wakeup_capable(tty_dev, 1); } else { + uport->flags |= UPF_DEAD; dev_err(uport->dev, "Cannot register tty device on line %d\n", uport->line); } @@ -3426,8 +3430,6 @@ int serial_core_register_port(struct uart_driver *drv, struct uart_port *port) if (ret) goto err_unregister_port_dev; - port->flags &= ~UPF_DEAD; - mutex_unlock(&port_mutex); return 0;