From patchwork Mon Oct 24 11:31:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 9969 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp614409wru; Mon, 24 Oct 2022 12:23:51 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5NzqEkBakDtp273qRA5urF4mG4+faOIqeMl/EziHUXUnUSXxgrgaPhmZUhWfHojfv2KcyN X-Received: by 2002:a17:907:9811:b0:79a:a1fe:8be6 with SMTP id ji17-20020a170907981100b0079aa1fe8be6mr16490476ejc.480.1666639431508; Mon, 24 Oct 2022 12:23:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666639431; cv=none; d=google.com; s=arc-20160816; b=PHtuWhvexQ6DGQUJMSLhwU5shPlIzyV0EIthZDUNj0jBPJpFHbAd5QmaxUvq7VECFo X9K0u2aQUbOSi6hXd+bVG/a+inklvSIf1y0FsE9SAXr9AkWdqqWlk3/JUKeHZdlrIcdJ PD5dCgVpYotCEc3wooV4lYnmyrnJYcO+iB9CGsQ+1g5oeyx/ChBmYgXgrxOmwY9n9v9o miBHERf6IlTiLx202Ov4jxbW9Zq4FjOGBvT3gyzONS2IdqksO12dywEuZ+7oc5sVKUQA P+t/SpgTZkhy1dl8BQKQHwbDITDubHF2Zwg7+6bNRul65XtBuK5AecBQXlH4X1n9FhCv 0mvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Eov/uMuMp9j+hJEgM21txxRehHFmYrDxlL6AB+0WeQg=; b=ewkHRcZgvsQpavsgWwD1SBtrirq5lRsZG9061bvhSOiCSC8mimw/M/cqpgPXxqV0Mu BxMGuUMwZvE9mI9eg4TL1sNmLmlrc4QdUlVNP7VkDX4ML66ZdKJD6IoVhoHGtSvhV3kU DY/Mkmbc83+kuDzYQQK5nwKD5RzOY889X1l//b05h0hc3kNsdhqoXpaLbXUvKmqHBx3u 5FaBdMzByhA2O+uDt8cMhJAmDIFKJSPkYgUFRlfaZQJM0J22MEK+VsOEoj/BMXk7395/ PlE7gJjJTmeUcuGUycvWqoIoF7XNayrRCsWeG+ccnq97KjTYqtc+X/MrRTYRwt2OxX2k 5NVA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=bcA6F7Vw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id es15-20020a056402380f00b004615fad6144si574049edb.40.2022.10.24.12.23.26; Mon, 24 Oct 2022 12:23:51 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=bcA6F7Vw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230241AbiJXTUS (ORCPT + 99 others); Mon, 24 Oct 2022 15:20:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52214 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231146AbiJXTTm (ORCPT ); Mon, 24 Oct 2022 15:19:42 -0400 Received: from sin.source.kernel.org (sin.source.kernel.org [IPv6:2604:1380:40e1:4800::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5A3AB4198A; Mon, 24 Oct 2022 10:56:09 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sin.source.kernel.org (Postfix) with ESMTPS id E4087CE1362; Mon, 24 Oct 2022 11:53:31 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D3ADCC433C1; Mon, 24 Oct 2022 11:53:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666612410; bh=GNPGlTVN0Wx/jDcaPTBSQwgG0mCsQRKC7an2BZBzTCA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bcA6F7VwvKoQEnBdJAZAMN/WlE5VW5kd3gisyV0eTDMJx3B3KVVzIRCHUbmfWHlnZ bdOCx9N9CLUMAhS7BQYTTLjbO2pzoN+Esxo1FXmeWsHMLXrP5bKI0U0Y4su54ofuAH qgy1CuT75AJhBVwXR+g6xrndc8aT5zvsxrU33OZI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Hans de Goede , Sasha Levin Subject: [PATCH 4.14 187/210] platform/x86: msi-laptop: Change DMI match / alias strings to fix module autoloading Date: Mon, 24 Oct 2022 13:31:44 +0200 Message-Id: <20221024113003.026570106@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024112956.797777597@linuxfoundation.org> References: <20221024112956.797777597@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747598108608712438?= X-GMAIL-MSGID: =?utf-8?q?1747598108608712438?= From: Hans de Goede [ Upstream commit 2a2565272a3628e45d61625e36ef17af7af4e3de ] On a MSI S270 with Fedora 37 x86_64 / systemd-251.4 the module does not properly autoload. This is likely caused by issues with how systemd-udevd handles the single quote char (') which is part of the sys_vendor / chassis_vendor strings on this laptop. As a workaround remove the single quote char + everything behind it from the sys_vendor + chassis_vendor matches. This fixes the module not autoloading. Link: https://github.com/systemd/systemd/issues/24715 Signed-off-by: Hans de Goede Link: https://lore.kernel.org/r/20220917210407.647432-1-hdegoede@redhat.com Signed-off-by: Sasha Levin --- drivers/platform/x86/msi-laptop.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/platform/x86/msi-laptop.c b/drivers/platform/x86/msi-laptop.c index 1ba5f4689df4..42b31c549db0 100644 --- a/drivers/platform/x86/msi-laptop.c +++ b/drivers/platform/x86/msi-laptop.c @@ -609,11 +609,10 @@ static const struct dmi_system_id msi_dmi_table[] __initconst = { { .ident = "MSI S270", .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "MICRO-STAR INT'L CO.,LTD"), + DMI_MATCH(DMI_SYS_VENDOR, "MICRO-STAR INT"), DMI_MATCH(DMI_PRODUCT_NAME, "MS-1013"), DMI_MATCH(DMI_PRODUCT_VERSION, "0131"), - DMI_MATCH(DMI_CHASSIS_VENDOR, - "MICRO-STAR INT'L CO.,LTD") + DMI_MATCH(DMI_CHASSIS_VENDOR, "MICRO-STAR INT") }, .driver_data = &quirk_old_ec_model, .callback = dmi_check_cb @@ -646,8 +645,7 @@ static const struct dmi_system_id msi_dmi_table[] __initconst = { DMI_MATCH(DMI_SYS_VENDOR, "NOTEBOOK"), DMI_MATCH(DMI_PRODUCT_NAME, "SAM2000"), DMI_MATCH(DMI_PRODUCT_VERSION, "0131"), - DMI_MATCH(DMI_CHASSIS_VENDOR, - "MICRO-STAR INT'L CO.,LTD") + DMI_MATCH(DMI_CHASSIS_VENDOR, "MICRO-STAR INT") }, .driver_data = &quirk_old_ec_model, .callback = dmi_check_cb