From patchwork Mon Oct 24 11:31:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 8523 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp405846wru; Mon, 24 Oct 2022 04:57:47 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6pQQ/kIlXG2e+sPlMMqWbqIrAkZhMS/KJ+zujJcX7Bg3lQIAdL+BoN0julCDAmIRf8pDt1 X-Received: by 2002:a63:2c90:0:b0:439:ee2c:ab2f with SMTP id s138-20020a632c90000000b00439ee2cab2fmr29055303pgs.2.1666612667451; Mon, 24 Oct 2022 04:57:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666612667; cv=none; d=google.com; s=arc-20160816; b=GbTWU3FDybEwX3qIMZG9LLR8ujWnirJq1eePbjFBrYFVj+8vinPZISa77P0rCIlaRZ 6qh/e72RQDpMHxmibb2OjHa73/cFw/NhPXyNWZFrP3GvJUxZlaMUkzAKme5CP9BTAJMd joVceNFZbtzn3iHAnkRZtgw1wkDTSE7lef5/HJpYoh0SPE4pSD+rgAlTO+U9gw3iah93 lDmPrRtLpGfeZRFTLz2J+F2VEo6I5BPIZSLZVu0oGXpP8uMiMGlmx4VZxqvXkhligJco JqlIGOmA9kYSBhJlkP0DP/QeVSKa3XcYO9hOOB9JF/2fblzFAKDFV9rn3JueZW/nKWUV CuAA== 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=OElQLt3L0RqtRAbte7JCQCD93m9hcRdmRY/WHh6gWRs=; b=jSmV01a6e4hqe886JLu9e1Tvz8taq58Nzl1Pt8iqUq5tAMpklZ5yYHx/ViTEOYcCjC GkuIF00CSE/mtjwyrghhKWB+luTOsnOiEw9tJyD2pZi6/Nt/e6Hxs6pHPIN3T9UhNbya qGgWqK0FJncJxN8JFsqIsFzE3ga8PFvhcERCPNNQ7iXD/u4ZcukIhZ4dF8zqcK2pEsSG cCmme0klKofnLJrv5asjgRGZ7gdzK1mg9AqCPESulH1Ve4EK4m+y1uSctjLgzGp8MCzx T+qb3zgvckK7DptNU5X2lloooYIjbzJ4LJ9SR+q+LqmqD/XqTZMSI0/GqN6qZ0wTwCXr Fo6Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Mvu5rjvw; 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 n24-20020a17090ade9800b0020db7d975ecsi8293165pjv.176.2022.10.24.04.57.34; Mon, 24 Oct 2022 04:57:47 -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=Mvu5rjvw; 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 S232339AbiJXL5L (ORCPT + 99 others); Mon, 24 Oct 2022 07:57:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57568 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232094AbiJXLz3 (ORCPT ); Mon, 24 Oct 2022 07:55:29 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A3B097A77E; Mon, 24 Oct 2022 04:46:31 -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 ams.source.kernel.org (Postfix) with ESMTPS id C9DF3B81181; Mon, 24 Oct 2022 11:44:23 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2EC05C433D7; Mon, 24 Oct 2022 11:44:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666611862; bh=DlZ1qlhuvU0M2fmOjGTSsN/rid3kjJxd5Kr7o+fWS5s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Mvu5rjvwU1toowyCbZyIWoMB4PDHO7gUBoUt/R+nFODljD+j7RFSc6VMyCUIhO4Qt IibS+my/bCYzUwYnFTfwlzXu164ZVBq2TXgwYy2nbWZ02AqPEBoz6qhhjo4xA/tLU+ 9vMmrzdohav6a4m23B1U013UqQJrNandc1mrZyhY= 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.9 139/159] platform/x86: msi-laptop: Change DMI match / alias strings to fix module autoloading Date: Mon, 24 Oct 2022 13:31:33 +0200 Message-Id: <20221024112954.546646685@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024112949.358278806@linuxfoundation.org> References: <20221024112949.358278806@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?1747570044449463681?= X-GMAIL-MSGID: =?utf-8?q?1747570044449463681?= 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 c2a1bc8e9fef..4ae2287ce262 100644 --- a/drivers/platform/x86/msi-laptop.c +++ b/drivers/platform/x86/msi-laptop.c @@ -609,11 +609,10 @@ static struct dmi_system_id __initdata msi_dmi_table[] = { { .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 struct dmi_system_id __initdata msi_dmi_table[] = { 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