From patchwork Mon Oct 24 11:31:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 8836 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp431480wru; Mon, 24 Oct 2022 05:43:56 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6NPDebxQP1EfUV5Tb/fjKwAJWL+Aucfbu8bVqaoPOV953npAqTQa4sdzEq9sqZi0+hUP7L X-Received: by 2002:a05:6a00:114f:b0:563:a934:718e with SMTP id b15-20020a056a00114f00b00563a934718emr33416477pfm.41.1666615435953; Mon, 24 Oct 2022 05:43:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666615435; cv=none; d=google.com; s=arc-20160816; b=DZnMFRg/8/zVODr/sS5UqgVL+JQp73Kmo15v2b+Ti08D0LtChlmiTAiAUJzVOTU9DQ NDsnlnG7WJ5t5hQY0vaoE5fr0b+SU3YamickrNnzppm0sKgGba5exgCYrAOt67NZ0emI DjPHCAQ1RdJmaUsIl9gIFeAghDSLCOjBjx+wpIG0OeOyA149u7jjELDRewTcVc7ANlem dcEj/RiUY7AUygYQKLms0B9/OGQkMexz85aHjwQr44SLMPt/ahteeRrfTGc5j4HDyJ9J 7VRROY2AP3dW/V0uSsyR+rN88m84UZoqyGY814P6BjyG8gjtxCkeZ1ghZMYQC8RKgnf4 agXg== 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=a7l2BbY1FXU/qq3N0uJPdpd4gFOT2Tl58zFWwQ2YszuiGTVMn2udfg639cadst0CbM NH/2wG89sU2lPppVkEpcnXF9NJGoLBlD9fTm4ISYFhaogQsc2RLMoKjmEYO218lmsdKq AeuS9UAI4ShrO4LyzCLlaey/mZhHeBLCQ0odyaDyTS8PFN6VYppZF3GREjl1Pc8NSywQ SXwTnJZIYJ3MgS/tkGSI+mhtvzf7jw72nKD7YphRdYZWs43i7sq3DvwjGB5lKZdDZqD6 UsHlRYaaPwQkO0HCkA+wkHJmYaB84O0++4yxBJwqZX3beht/2ac4VCT1IJ1WWMs3+17V vM/g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=ZM7+Ti4T; 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 u4-20020a170902e80400b0017a7506e0dcsi37868665plg.231.2022.10.24.05.43.40; Mon, 24 Oct 2022 05:43:55 -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=ZM7+Ti4T; 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 S234739AbiJXMft (ORCPT + 99 others); Mon, 24 Oct 2022 08:35:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45036 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234280AbiJXM3z (ORCPT ); Mon, 24 Oct 2022 08:29:55 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 514062FFEC; Mon, 24 Oct 2022 05:03:55 -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 dfw.source.kernel.org (Postfix) with ESMTPS id 23681612E3; Mon, 24 Oct 2022 12:03:14 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 331D2C433D6; Mon, 24 Oct 2022 12:03:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666612993; bh=GNPGlTVN0Wx/jDcaPTBSQwgG0mCsQRKC7an2BZBzTCA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZM7+Ti4TJ0WBnsZcmsS/Iie777ik+XyBJmqxHKfbI8vaxf0xm/Q/P0mmi1SIwKTZa mqJr0buioa+042oJsGTwMXdbiRSGXBV0zO97pr5ReIwOW2sAoMizi3CQ7/i+Q3rhZN 9zi/DD9XzuSPiNlJZSkSd94QZs9j5KjMJ5UCT834= 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.19 198/229] platform/x86: msi-laptop: Change DMI match / alias strings to fix module autoloading Date: Mon, 24 Oct 2022 13:31:57 +0200 Message-Id: <20221024113005.545254819@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024112959.085534368@linuxfoundation.org> References: <20221024112959.085534368@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?1747572947398590214?= X-GMAIL-MSGID: =?utf-8?q?1747572947398590214?= 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