From patchwork Fri May 3 03:08:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Weifeng Liu X-Patchwork-Id: 13652295 Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A1993D29E; Fri, 3 May 2024 03:10:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714705809; cv=none; b=fcgFxem6XlUwncThQc5UaETXRseQA8n4qPP4SRD3+WUbptzKYwIoHKh8yzt9+gW4LZH/5x25X0mizaDIenRL2xW1HwxtlkpSaG/Ve3NCoUN7kEV22waRUNWXLVBKFM8iBBtbEfeW+LrHjeblsIf4KArifLCT/UvWqVsMl+nYU+k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714705809; c=relaxed/simple; bh=ZFy7RV/qnZ66bkbISNuDnLepsQnte6ofUaeUDWaTynQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=m7Q069mO1bGTmBHLFN3PMKxohGsnYgNAJG8YOyJXA34MMUoGDHyneToQji1gGVEljbNTNLQHWwlme1fCBCwV1lWYz3SIP7hcWBUOMoGBh9bSmmJ/EOWlp8uKnQSERCmthyrGNGIF6M2tmbq2PuesdEXw3NLczNxOmGhas2McxCk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=lcQR8ny5; arc=none smtp.client-ip=209.85.210.179 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="lcQR8ny5" Received: by mail-pf1-f179.google.com with SMTP id d2e1a72fcca58-6edc61d0ff6so8571978b3a.2; Thu, 02 May 2024 20:10:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1714705807; x=1715310607; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=dFVpLCD9T2vg2E3o/Ee50coJimYg2ObSiJNkZ9oPXcc=; b=lcQR8ny5hCFf5VS8zWusikys+h4Iv2gBsSp86xFcqLZoB90pfBqG2P33wq/iJTHM0K ALStFXUI7YyQR28Z5Ez7HuM2fsX3GndF5ROmX7jRc11hMlCfKSyD4Jr8dhjLJdyjYDe3 +omGIvB2Ef2ZOv2Fb9tDBAe6S552A28YMsF2RCZBIlpRwKH6ocqojtgX9pcu0yq0YSVS NaIzTVs9CYkIarGBf11tp2zPf9YG02dJ/5Syad5l2izdlkxlzGrNPAIwri7lQkcVZV57 h4QCk6s6wjB/GOeK0GWaNuCbLkwlwp7vSgRFBDC7DLAPJ+A3WJaojENo1pHQAF1Pzeam S63w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714705807; x=1715310607; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=dFVpLCD9T2vg2E3o/Ee50coJimYg2ObSiJNkZ9oPXcc=; b=fB0HHtnzHeo0I3lYA09b4pOmAkHpdRzUdG1XvWgL1sien5bLNknniuo1hcRlvRznB7 IrwQwo+fejE3HcSZqJ2Y3JLamFWvmDz4IAW/u287bQa3T2g77IUcVCQiwe8OShxjODwi PzxmQ8ZbizMCt9C972hXuGQdscH0rphfUw6nYP7gnBeaTV5mSjWMO75MZy+5YSnMzm0t 9BpwJuZJvzrh4SpEoAmXaSD78T1pmCr6ELACb93vKDcfKmpZatIrCrcfxDISOG/nLCob zTwxvx8PpfD/V34vzBWZhYdAzI90e/NN14En+JV9L5cFwAmZeBJPAz8rBpk/zetWTX3W EsAg== X-Forwarded-Encrypted: i=1; AJvYcCVX1AL1sT9tKWfgWypwhi/eytZcXQ+3EEfGC0Y12ROmXkFrHcCYo0urZN5wQvwUVX1kEIVcMnHelsKo+Npne0uDPHRMiWd5Y8eaJ3jL X-Gm-Message-State: AOJu0Yz5kdqf7U+5wHYFdXY/fI+W3d1LcTl9zWKlC3cGlMcewL5vbQUC Ot6oeM+knhIRKuHgekhGqirbSancGUYrxwloyuWB0XHd8NVUaKhLA5tCLeFbp6nO9RJn X-Google-Smtp-Source: AGHT+IGqdK8qqaQwNL0AiGoaPP3gC77Kp51AD73CK2qBJq3tnPPtvpj3b10emMVBKvO89Yg9LjByIQ== X-Received: by 2002:a05:6a20:745:b0:1a7:549e:ab80 with SMTP id l5-20020a056a20074500b001a7549eab80mr1244874pzl.47.1714705806903; Thu, 02 May 2024 20:10:06 -0700 (PDT) Received: from localhost ([103.192.225.105]) by smtp.gmail.com with ESMTPSA id n2-20020a170902d2c200b001e0bae4490fsm2116208plc.154.2024.05.02.20.10.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 May 2024 20:10:06 -0700 (PDT) From: Weifeng Liu To: platform-driver-x86@vger.kernel.org, linux-serial@vger.kernel.org Cc: Weifeng Liu , Andy Shevchenko , Maximilian Luz , Hans de Goede Subject: [PATCH v2 1/2] platform/surface: aggregator: Defer probing when serdev is not ready Date: Fri, 3 May 2024 11:08:46 +0800 Message-ID: <20240503030900.1334763-2-weifeng.liu.z@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240503030900.1334763-1-weifeng.liu.z@gmail.com> References: <20240503030900.1334763-1-weifeng.liu.z@gmail.com> Precedence: bulk X-Mailing-List: platform-driver-x86@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 This is an attempt to alleviate race conditions in the SAM driver where essential resources like serial device and GPIO pins are not ready at the time ssam_serial_hub_probe() is called. Instead of giving up probing, a better way would be to defer the probing by returning -EPROBE_DEFER, allowing the kernel try again later. However, there is no way of identifying all such cases from other real errors in a few days. So let's take a gradual approach identify and address these cases as they arise. This commit marks the initial step in this process. Suggested-by: Maximilian Luz Reviewed-by: Maximilian Luz Acked-by: Hans de Goede Signed-off-by: Weifeng Liu --- drivers/platform/surface/aggregator/core.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/drivers/platform/surface/aggregator/core.c b/drivers/platform/surface/aggregator/core.c index 9591a28bc38a..87dea91f91fe 100644 --- a/drivers/platform/surface/aggregator/core.c +++ b/drivers/platform/surface/aggregator/core.c @@ -645,9 +645,22 @@ static int ssam_serial_hub_probe(struct serdev_device *serdev) /* Set up serdev device. */ serdev_device_set_drvdata(serdev, ctrl); serdev_device_set_client_ops(serdev, &ssam_serdev_ops); + + /* + * The following step can fail when it's called too early before the + * underlying UART device is ready (in this case -ENXIO is returned). + * Instead of simply giving up and losing everything, we can defer + * the probing by returning -EPROBE_DEFER so that the kernel would be + * able to retry later. + */ status = serdev_device_open(serdev); - if (status) + if (status == -ENXIO) + status = -EPROBE_DEFER; + if (status) { + dev_err_probe(&serdev->dev, status, + "failed to open serdev device\n"); goto err_devopen; + } astatus = ssam_serdev_setup_via_acpi(ssh->handle, serdev); if (ACPI_FAILURE(astatus)) { From patchwork Fri May 3 03:08:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Weifeng Liu X-Patchwork-Id: 13652296 Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 60B6DD29E; Fri, 3 May 2024 03:10:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714705812; cv=none; b=Vvny3VNvG5yPkleMaT+JZ4AGogzsvMqExeyLytfIeYm1fXS6Fi642wxVXzyFLOo7eRO9yVeQxE4g7/KdJwFP6YFLD1dD9VtpUaC4/tzHvw49u9pna2I5vJCECGfamPIV5phduPRCCNezfIOrRGmP5nCGVXOJy5/iMVj9uqloUvw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714705812; c=relaxed/simple; bh=kJ3ojKJAVBcz2RiA3BFjiDMat6Xto/qsEw0mYP6/uZU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=iQeTufRhRmGDIfKYmxHI25emejYpDldEMTiq2zeZqBwuyu2WRbIulKFynP/rRiwIFp//LJh9YGFqku7MYZiSCQv6KArVw3WQDJlnbMb6E9YhE+fuBzgYmz0rGTa1yJNlstquP11XIHgl8TiWlwav6u5Hr78W/hngWkdrpLt0woQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=LcO72kla; arc=none smtp.client-ip=209.85.214.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="LcO72kla" Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-1e5715a9ebdso73831745ad.2; Thu, 02 May 2024 20:10:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1714705810; x=1715310610; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=lRq8CUSvJnsXeuAcvVriayUMzf92ciMQ2l30uycbhdU=; b=LcO72klaAbBDw511hlInUDvK564eNZc7OlJzyQOiwNXlUYp7O4ktT8qeuKc4SwaWO+ 79ld34Y69xoQoLkrU4geUYcTgWcmHap9xOWQRF31y07Jg0y33gIroBsBJyA3o46S17UB M/3Zm9o7w6EDU7wdNjX41LRi3Cdeist7BvxYpjfn0vD6OCgImhfcKcbwrj0PbHOqz7mk 6HdxKHIKsZAkFIBsP9+pYfCR4emmfMVX/LkSx3u0A5BWh92JQcZOCKmUm+1OLI9PKUvK r7Xtz9MRv8ej6xBsPFwmq97EEr7CiJLIgWU32WjKGAX8LhCPLJ+eR7lAdizzr5B6jJB1 vDcw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714705810; x=1715310610; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=lRq8CUSvJnsXeuAcvVriayUMzf92ciMQ2l30uycbhdU=; b=rx/1rIjg5sQ6jWmRRqwHpLFmjTugccsnl4XjPPRG5WnLfTZ60I/j7zBG8acK59ovfV RFXJyoAY3R+yVwVmCQCV5U1/aJ1epGbhkDLrknFAeCOJvbVwR6On4BpxW4H9d5xj0LGA kXGIvvafhaD9xi3icKGkzgLMpuvzCRFj5LBy/36QcNeMBEJE4i44KVGgYTchePTweCdK sZnjUEk90D0D0Q8ZkCTV+YgrCDitPoJvMP6x0g4rDn/IAIWHUii58PdW/coDSxjuxJe1 PGI0gsyTyEEjZtSyK1YoGD3VNLYQX6osANYtUzPefyb3Nrktn1OuyFCOVMM7HHs+xrC0 2ANw== X-Forwarded-Encrypted: i=1; AJvYcCXWLxC6DQ5GVDk8oQ9N7dgU3ZmSgeBlEqtCX2kt59hYlaUCam4tYn9MzUVCNmKQorBIoHy1dkQl7KX1iFFer2rjONDEhrp9uFvM5GdV X-Gm-Message-State: AOJu0Yz52QZ/iClIbpoq9I5mLqw1ThmAJBv69z2kmvCzSfRNScO67hUN E/Vphr9JiJg0qGJmuaV0KRiAce8Iy5pxat72+JGPijiZ5yYAkK/lS9E3t5sKOJSqzPZK X-Google-Smtp-Source: AGHT+IGP4wCaT+laolf/XY16B+KqRL3WNhpXx/bBCSd0DC5Fp8Kr56Nu3+hTg3Ca48KeYvmVCwGg6A== X-Received: by 2002:a17:903:2656:b0:1eb:632d:f622 with SMTP id je22-20020a170903265600b001eb632df622mr1379845plb.40.1714705809711; Thu, 02 May 2024 20:10:09 -0700 (PDT) Received: from localhost ([103.192.225.105]) by smtp.gmail.com with ESMTPSA id p2-20020a1709027ec200b001ec636c883csm2144545plb.105.2024.05.02.20.10.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 May 2024 20:10:09 -0700 (PDT) From: Weifeng Liu To: platform-driver-x86@vger.kernel.org, linux-serial@vger.kernel.org Cc: Weifeng Liu , Andy Shevchenko , Maximilian Luz , Hans de Goede Subject: [PATCH v2 2/2] platform/surface: aggregator: Log critical errors during SAM probing Date: Fri, 3 May 2024 11:08:47 +0800 Message-ID: <20240503030900.1334763-3-weifeng.liu.z@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240503030900.1334763-1-weifeng.liu.z@gmail.com> References: <20240503030900.1334763-1-weifeng.liu.z@gmail.com> Precedence: bulk X-Mailing-List: platform-driver-x86@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Emits messages upon errors during probing of SAM. Hopefully this could provide useful context to user for the purpose of diagnosis when something miserable happen. Reviewed-by: Maximilian Luz Acked-by: Hans de Goede Signed-off-by: Weifeng Liu Reviewed-by: Andy Shevchenko --- drivers/platform/surface/aggregator/core.c | 32 ++++++++++++++++------ 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/drivers/platform/surface/aggregator/core.c b/drivers/platform/surface/aggregator/core.c index 87dea91f91fe..b3359ce13e0d 100644 --- a/drivers/platform/surface/aggregator/core.c +++ b/drivers/platform/surface/aggregator/core.c @@ -623,8 +623,9 @@ static int ssam_serial_hub_probe(struct serdev_device *serdev) acpi_status astatus; int status; - if (gpiod_count(&serdev->dev, NULL) < 0) - return -ENODEV; + status = gpiod_count(&serdev->dev, NULL); + if (status < 0) + return dev_err_probe(&serdev->dev, status, "no GPIO found\n"); status = devm_acpi_dev_add_driver_gpios(&serdev->dev, ssam_acpi_gpios); if (status) @@ -637,8 +638,11 @@ static int ssam_serial_hub_probe(struct serdev_device *serdev) /* Initialize controller. */ status = ssam_controller_init(ctrl, serdev); - if (status) + if (status) { + dev_err_probe(&serdev->dev, status, + "failed to initialize ssam controller\n"); goto err_ctrl_init; + } ssam_controller_lock(ctrl); @@ -664,7 +668,8 @@ static int ssam_serial_hub_probe(struct serdev_device *serdev) astatus = ssam_serdev_setup_via_acpi(ssh->handle, serdev); if (ACPI_FAILURE(astatus)) { - status = -ENXIO; + status = dev_err_probe(&serdev->dev, -ENXIO, + "failed to setup serdev\n"); goto err_devinit; } @@ -680,16 +685,25 @@ static int ssam_serial_hub_probe(struct serdev_device *serdev) * states. */ status = ssam_log_firmware_version(ctrl); - if (status) + if (status) { + dev_err_probe(&serdev->dev, status, + "failed to get firmware version\n"); goto err_initrq; + } status = ssam_ctrl_notif_d0_entry(ctrl); - if (status) + if (status) { + dev_err_probe(&serdev->dev, status, + "failed to notify EC of entry of D0\n"); goto err_initrq; + } status = ssam_ctrl_notif_display_on(ctrl); - if (status) + if (status) { + dev_err_probe(&serdev->dev, status, + "failed to notify EC of display on\n"); goto err_initrq; + } status = sysfs_create_group(&serdev->dev.kobj, &ssam_sam_group); if (status) @@ -697,8 +711,10 @@ static int ssam_serial_hub_probe(struct serdev_device *serdev) /* Set up IRQ. */ status = ssam_irq_setup(ctrl); - if (status) + if (status) { + dev_err_probe(&serdev->dev, status, "failed to setup IRQ\n"); goto err_irq; + } /* Finally, set main controller reference. */ status = ssam_try_set_controller(ctrl);