From patchwork Mon Oct 24 11:32:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 9605 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp529632wru; Mon, 24 Oct 2022 09:03:55 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5lrX+QdN88xPAWtnLgj3dxhQgjYOQahmhYsDljsKJoiDfAewQXaIrCSPGVL32oVkmytN18 X-Received: by 2002:a17:902:ce8f:b0:186:b051:1caa with SMTP id f15-20020a170902ce8f00b00186b0511caamr3926247plg.12.1666627435221; Mon, 24 Oct 2022 09:03:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666627435; cv=none; d=google.com; s=arc-20160816; b=LajmP99s+mpb57xYs1zkvVnR3RS3dFE54G+mi99SggQfHYoyeV4iYV8aEy5BR3EaWo od5N0J0faVVQoaLcZopcCvmPd33c6k3PCUNvJkZwtV1nc5IRUjrYPNPhIo5IrxfRtJA8 AdIeb4y4NMSvZzpL573dIfgAVoIWhsifaUWc5JHws17xasrnbT5mGB2QIUl27kjb1KHa Nhg0RoAPFM2C0VvIJQiRNZkp/QzOu7H8zSo2eV4N3Vfs3O/oS1CUhE33MxC8T9GJiBu9 FD2DRerwULB7JC5tEwER46ZGGjvW0uVI/4IzsI9vtKtABjVPHHS/U/WVyS32eH6EucAt PdTQ== 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=HKWcpNGSz/qO9umKP5O4jo5RzD6s32hka6dtmUVAbiY=; b=ywn5mPBdJGgzFtpdHXZWlpx7IEsWQOfS8ShvEsngSuUvPGXrFQELPyCKoCi24SuAgB aVRhiAwl/+Jza1/3KPHRCoZ5P2SxeRRrY/fIc7kXdrhehzQbf1YwiHv9cN6ogoSM3hqZ 37L2WI/ILJnZozvYul464T1M0payae7JLKTPm+5YxJLBkbasiQcMGDRp8S2f7KsuYbt+ 8SkzXccetYep8sHmU3qA9yXfbC0QWtbKOBTQggE5KyxWy3bHIAuNnvOjODgw9Th4Aevn gGAdGhVmN09zpiMfskaiXaoiczZzBYdNUS3HT4Rjg9+QAEPOvN9BmTpSqoxkg7MRtgng oJrQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=qFVei7Wx; 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 f22-20020a17090a9b1600b0020ade3b9825si268056pjp.52.2022.10.24.09.03.40; Mon, 24 Oct 2022 09:03: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=qFVei7Wx; 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 S231895AbiJXQAQ (ORCPT + 99 others); Mon, 24 Oct 2022 12:00:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41036 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231758AbiJXP6r (ORCPT ); Mon, 24 Oct 2022 11:58:47 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8873321E04; Mon, 24 Oct 2022 07:53:50 -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 113D8B816B8; Mon, 24 Oct 2022 12:30:35 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6191FC433D6; Mon, 24 Oct 2022 12:30:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666614633; bh=VyRbyK2ww2404bbaV+nZGsh7aEeNQVyazO8tGuaL5hY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qFVei7WxuFonIozhkfSMOVrVYYY/Z57amCxoepZwXID44Fo2bfe1TulED/kVKHOyt OJ+dtJBlnEs1vDAbFOyQKVDGIxvowRswEUXD/rdt/4sTVdcQwPol4JErxc89DqREmZ XI6trKrYgFU+WGBFCN2BhawuXcP5pEK+3A6xRcMI= 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 5.10 335/390] platform/x86: msi-laptop: Change DMI match / alias strings to fix module autoloading Date: Mon, 24 Oct 2022 13:32:12 +0200 Message-Id: <20221024113037.270449887@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113022.510008560@linuxfoundation.org> References: <20221024113022.510008560@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?1747585529378152319?= X-GMAIL-MSGID: =?utf-8?q?1747585529378152319?= 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 3e935303b143..0e804b6c2d24 100644 --- a/drivers/platform/x86/msi-laptop.c +++ b/drivers/platform/x86/msi-laptop.c @@ -596,11 +596,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 @@ -633,8 +632,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