From patchwork Mon Mar 13 18:28:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 69029 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1347292wrd; Mon, 13 Mar 2023 11:47:36 -0700 (PDT) X-Google-Smtp-Source: AK7set8ZTkaSsjAcLX1vI8tsKeDpPELKZ8guvqvNDqEOYsaE5KN1pHlKyFlhqMRjFCq9rP+K1wA1 X-Received: by 2002:a17:902:cecb:b0:19f:27f9:397d with SMTP id d11-20020a170902cecb00b0019f27f9397dmr8803410plg.9.1678733256248; Mon, 13 Mar 2023 11:47:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678733256; cv=none; d=google.com; s=arc-20160816; b=QHuv3FvyTr9HQHDBrLfKE7cCnwdldieyc4jGA0Zm2XIgfrDDgXnEVvbQqk/t0iWHuw z3BLRzNUd95LOSzzlg7OpWsQjVfiUOjRG03y3ywmwGpO/Bz0gLfayfWDXVlB7FUW/SCz dC+q3OxM2dgnw80Ck/LWMk9URW7elKqaMYuRvR+M6yD9iSgsrG9SqGYHq5OIo24F8opk ISzsc/TF8cPt/lyZyYW0/4GHEFv0VqGzfpfrNHY/qeUp6ZSBM+YicLj/gsWO9V9z7U2B rzs+naMUP56/MjeUIvCH8XfB+r4YgFq34TzoYLGOEJuaBpRnX7TnwB/0Yi7D7LtxtxeR 9Raw== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=iYA8CVOVYJrfuyBoeO/LstOM3+Nx6i83nGZVBfqlHKA=; b=pmXvzikvcPsuusOfZ4f7ORNhk1fTOkly+dZtv5iPoWTlCEaULeYzwls98kslvaHyai kbdikNxJMTXtnMEejKNXKB0kyveeFjDweW/1U8xOx78xHarUdMGnuBY32P36SLgZCl+J sKofIYd82d/N2+e71Zw/JK54mWDcp9w/xrIUUkEq7J2imZh01jp62ZnmppugCBqRsIh1 2mP6jtOkHRpYLQIkUB5r+npLcZS/bAVLkgvwgg5JKqixNu7PQdjKaWOo5YO4GvyuqabR /ycJks3r7flBzNSscoyk9Td3G9zxEGyl0DNAhjntDX6DJq3zUiGtM0FYoayVK7IrHvJY Ya+A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=h0FQLumS; 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 ko3-20020a17090307c300b0019ca54e71e4si400377plb.224.2023.03.13.11.47.23; Mon, 13 Mar 2023 11:47:36 -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=h0FQLumS; 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 S231335AbjCMScD (ORCPT + 99 others); Mon, 13 Mar 2023 14:32:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34342 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230194AbjCMSb2 (ORCPT ); Mon, 13 Mar 2023 14:31:28 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 39A0184F41; Mon, 13 Mar 2023 11:30: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 AF4E7B811D9; Mon, 13 Mar 2023 18:29:25 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 24D08C433EF; Mon, 13 Mar 2023 18:29:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1678732164; bh=Y/2uHv7UuAu/TK9ErBIs8mV0SWLcXTcZZH/WgWkSiX0=; h=From:To:Cc:Subject:Date:From; b=h0FQLumSJSQdBb0rjII8jRPFNkX0uljxQbTywcCw66Xlq+q3CcDOUTPIWuAA7BimD KX8vi85pxzLO3wOueMkHSu/+WQYf2dvT1f/4M3shWz8G1bXB+Nq2nFB2o3NlTYjBYh hkEJQz+gNs+ZpBkP0+XRdkuCyYXh5nRreY7G+uh0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: rafael@kernel.org, Greg Kroah-Hartman , Borislav Petkov , Tony Luck , James Morse , Mauro Carvalho Chehab , Robert Richter , linux-edac@vger.kernel.org Subject: [PATCH 01/36] EDAC/sysfs: move to use bus_get_dev_root() Date: Mon, 13 Mar 2023 19:28:43 +0100 Message-Id: <20230313182918.1312597-1-gregkh@linuxfoundation.org> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=3456; i=gregkh@linuxfoundation.org; h=from:subject; bh=Y/2uHv7UuAu/TK9ErBIs8mV0SWLcXTcZZH/WgWkSiX0=; b=owGbwMvMwCRo6H6F97bub03G02pJDCn82cUfGs++u2V+7lpaslPa1Vv9E18fU1yu9zB4843Ai xcsTCbHdMSyMAgyMciKKbJ82cZzdH/FIUUvQ9vTMHNYmUCGMHBxCsBE3hczLNh6Om/Cq3XOzFbz A/0bS+f6t8/OP8qwYN9DlhWq+hksDzw/182f83bZihZuIwA= X-Developer-Key: i=gregkh@linuxfoundation.org; a=openpgp; fpr=F4B60CC5BF78C2214A313DCB3147D40DDB2DFB29 X-Spam-Status: No, score=-7.1 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?1760279403207860179?= X-GMAIL-MSGID: =?utf-8?q?1760279403207860179?= Direct access to the struct bus_type dev_root pointer is going away soon so replace that with a call to bus_get_dev_root() instead, which is what it is there for. Cc: Borislav Petkov Cc: Tony Luck Cc: James Morse Cc: Mauro Carvalho Chehab Cc: Robert Richter Cc: linux-edac@vger.kernel.org Signed-off-by: Greg Kroah-Hartman --- Note, this is a patch that is a prepatory cleanup as part of a larger series of patches that is working on resolving some old driver core design mistakes. It will build and apply cleanly on top of 6.3-rc2 on its own, but I'd prefer if I could take it through my driver-core tree so that the driver core changes can be taken through there for 6.4-rc1. drivers/edac/edac_device_sysfs.c | 16 +++++++++------- drivers/edac/edac_pci_sysfs.c | 14 +++++++++----- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/drivers/edac/edac_device_sysfs.c b/drivers/edac/edac_device_sysfs.c index ac678b4a21fc..010c26be5846 100644 --- a/drivers/edac/edac_device_sysfs.c +++ b/drivers/edac/edac_device_sysfs.c @@ -228,8 +228,9 @@ static struct kobj_type ktype_device_ctrl = { */ int edac_device_register_sysfs_main_kobj(struct edac_device_ctl_info *edac_dev) { + struct device *dev_root; struct bus_type *edac_subsys; - int err; + int err = -ENODEV; edac_dbg(1, "\n"); @@ -247,15 +248,16 @@ int edac_device_register_sysfs_main_kobj(struct edac_device_ctl_info *edac_dev) */ edac_dev->owner = THIS_MODULE; - if (!try_module_get(edac_dev->owner)) { - err = -ENODEV; + if (!try_module_get(edac_dev->owner)) goto err_out; - } /* register */ - err = kobject_init_and_add(&edac_dev->kobj, &ktype_device_ctrl, - &edac_subsys->dev_root->kobj, - "%s", edac_dev->name); + dev_root = bus_get_dev_root(edac_subsys); + if (dev_root) { + err = kobject_init_and_add(&edac_dev->kobj, &ktype_device_ctrl, + &dev_root->kobj, "%s", edac_dev->name); + put_device(dev_root); + } if (err) { edac_dbg(1, "Failed to register '.../edac/%s'\n", edac_dev->name); diff --git a/drivers/edac/edac_pci_sysfs.c b/drivers/edac/edac_pci_sysfs.c index 888d5728ecef..287cc51dbc86 100644 --- a/drivers/edac/edac_pci_sysfs.c +++ b/drivers/edac/edac_pci_sysfs.c @@ -337,8 +337,9 @@ static struct kobj_type ktype_edac_pci_main_kobj = { */ static int edac_pci_main_kobj_setup(void) { - int err; + int err = -ENODEV; struct bus_type *edac_subsys; + struct device *dev_root; edac_dbg(0, "\n"); @@ -357,7 +358,6 @@ static int edac_pci_main_kobj_setup(void) */ if (!try_module_get(THIS_MODULE)) { edac_dbg(1, "try_module_get() failed\n"); - err = -ENODEV; goto decrement_count_fail; } @@ -369,9 +369,13 @@ static int edac_pci_main_kobj_setup(void) } /* Instanstiate the pci object */ - err = kobject_init_and_add(edac_pci_top_main_kobj, - &ktype_edac_pci_main_kobj, - &edac_subsys->dev_root->kobj, "pci"); + dev_root = bus_get_dev_root(edac_subsys); + if (dev_root) { + err = kobject_init_and_add(edac_pci_top_main_kobj, + &ktype_edac_pci_main_kobj, + &dev_root->kobj, "pci"); + put_device(dev_root); + } if (err) { edac_dbg(1, "Failed to register '.../edac/pci'\n"); goto kobject_init_and_add_fail; From patchwork Mon Mar 13 18:28:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 69028 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1347090wrd; Mon, 13 Mar 2023 11:47:10 -0700 (PDT) X-Google-Smtp-Source: AK7set8mZuCyYv04jO8d+gLwLxX096rNHATUAuTroe5C/tyeER7J4H/Cjy6B1y8cHDpwsDb5bzJy X-Received: by 2002:aa7:9e5e:0:b0:622:8a8e:8cf8 with SMTP id z30-20020aa79e5e000000b006228a8e8cf8mr6743124pfq.14.1678733230201; Mon, 13 Mar 2023 11:47:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678733230; cv=none; d=google.com; s=arc-20160816; b=nxOuzCwd2Dik6c+8jBqMpa+hQcq6IoSEjJcx7M8ytU3UuTpH0CNNDnntpADKELDmIZ 47emxow7rvRERivQSgUaDHRdPXtN2P7w+4ouPIqXJTuMy685ijKArY2zP8PbG6NhlkHv Bls1ZG7oBYQHE1kh5mB2doOJeC7m6JIY+bHwVVxwc5f1OFHnN/2pjDbDvma96+09qAtd KK1S76PmnQVVd34zekI0JrfCxlxKVWIrYzb7PYO+8xt1/KytDp7/UKeGPTkIlJfKoPvX u8Ku7q6dSA9HaeeYhZtz211n8uLOZmoJy07YiBzt6orpwRWtEmg4WCD4Yqvrat8Wzwt1 yayA== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=i/Ua0PxvgzldLMLcE/yrBJI2MHOkHgnX1kapbxsaFSk=; b=vqJwPWMu/1CAU7Q/KxV0V/FD8hD0DzFRnIFBsQnHfmNs5IsV2oq0RngUXuxSrMQ0h1 5ifh6pyFbwVVCgE8UUfdoJHa6rNEUb9bbVkGZZl0NxHUGYm/1cILTnnYqNjYkRsPFtDo 1LfnMgUG37lE7MT8FVuEsNM/rPNs6IYh5AKL/9xT4NrFoZWyojXR3H2fY8I6xgv+nxi/ +MufSy6/N5Fu+oRgS9jvDw9Tt7M0Ff97Wy/Sfva/cd1TA5TaO9G9xrKRr0rSgQOXEQeN 0Hv3ST5WDc23P/phW4MxvSMdYF3U6Ac3RcxQTViS82wscFkmU1vpfPeYTPV+X5ZhyRJF zhWw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="p5+h/Fwc"; 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 y5-20020a63ce05000000b005038290f44csi139565pgf.527.2023.03.13.11.46.56; Mon, 13 Mar 2023 11:47:10 -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="p5+h/Fwc"; 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 S230301AbjCMSaN (ORCPT + 99 others); Mon, 13 Mar 2023 14:30:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33462 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230224AbjCMSaI (ORCPT ); Mon, 13 Mar 2023 14:30:08 -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 45F60746FF; Mon, 13 Mar 2023 11:29:32 -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 1C2FCB811D8; Mon, 13 Mar 2023 18:29:23 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8DC4FC433D2; Mon, 13 Mar 2023 18:29:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1678732161; bh=F5jf/JTxW3R0JUCStVxeFrVkNOg4tNx9+6PiesOi5Z8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=p5+h/FwcgMxm2RjkgHinbqRrDA77EWxq/o7knveMcMtDIzlPCfFnTqw5V/1PxJiQg zFsA9bxqVx2KJSICOO2UileuoWlC6nJjRl7M3ZHuoH5/BI38+/RPxNaEro7zbdT4GU NNLFzrMNVoMeJiMIdLUZzbNmaQUnf6uG1gPE5FIs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: rafael@kernel.org, Greg Kroah-Hartman , Len Brown , linux-acpi@vger.kernel.org Subject: [PATCH 02/36] ACPI: LPIT: move to use bus_get_dev_root() Date: Mon, 13 Mar 2023 19:28:44 +0100 Message-Id: <20230313182918.1312597-2-gregkh@linuxfoundation.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230313182918.1312597-1-gregkh@linuxfoundation.org> References: <20230313182918.1312597-1-gregkh@linuxfoundation.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2324; i=gregkh@linuxfoundation.org; h=from:subject; bh=F5jf/JTxW3R0JUCStVxeFrVkNOg4tNx9+6PiesOi5Z8=; b=owGbwMvMwCRo6H6F97bub03G02pJDCn82aXsiSHvwmLzbOPu+O+yzVkcvPHv/zdVcpOtbZKie +cfXxvdEcvCIMjEICumyPJlG8/R/RWHFL0MbU/DzGFlAhnCwMUpABOZt51hnt6lmX6hmkefHOS9 pevItv7wV6dKc4YF+37K+2lxMZxkfX1Ae5mG0QWp0OqtAA== X-Developer-Key: i=gregkh@linuxfoundation.org; a=openpgp; fpr=F4B60CC5BF78C2214A313DCB3147D40DDB2DFB29 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, 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?1760279375973419941?= X-GMAIL-MSGID: =?utf-8?q?1760279375973419941?= Direct access to the struct bus_type dev_root pointer is going away soon so replace that with a call to bus_get_dev_root() instead, which is what it is there for. Cc: "Rafael J. Wysocki" Cc: Len Brown Cc: linux-acpi@vger.kernel.org Signed-off-by: Greg Kroah-Hartman --- Note, this is a patch that is a prepatory cleanup as part of a larger series of patches that is working on resolving some old driver core design mistakes. It will build and apply cleanly on top of 6.3-rc2 on its own, but I'd prefer if I could take it through my driver-core tree so that the driver core changes can be taken through there for 6.4-rc1. drivers/acpi/acpi_lpit.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/drivers/acpi/acpi_lpit.c b/drivers/acpi/acpi_lpit.c index 3843d2576d3f..73b5c4800150 100644 --- a/drivers/acpi/acpi_lpit.c +++ b/drivers/acpi/acpi_lpit.c @@ -98,6 +98,8 @@ EXPORT_SYMBOL_GPL(lpit_read_residency_count_address); static void lpit_update_residency(struct lpit_residency_info *info, struct acpi_lpit_native *lpit_native) { + struct device *dev_root = bus_get_dev_root(&cpu_subsys); + info->frequency = lpit_native->counter_frequency ? lpit_native->counter_frequency : tsc_khz * 1000; if (!info->frequency) @@ -111,15 +113,18 @@ static void lpit_update_residency(struct lpit_residency_info *info, return; /* Silently fail, if cpuidle attribute group is not present */ - sysfs_add_file_to_group(&cpu_subsys.dev_root->kobj, - &dev_attr_low_power_idle_system_residency_us.attr, - "cpuidle"); + if (dev_root) + sysfs_add_file_to_group(&dev_root->kobj, + &dev_attr_low_power_idle_system_residency_us.attr, + "cpuidle"); } else if (info->gaddr.space_id == ACPI_ADR_SPACE_FIXED_HARDWARE) { /* Silently fail, if cpuidle attribute group is not present */ - sysfs_add_file_to_group(&cpu_subsys.dev_root->kobj, - &dev_attr_low_power_idle_cpu_residency_us.attr, - "cpuidle"); + if (dev_root) + sysfs_add_file_to_group(&dev_root->kobj, + &dev_attr_low_power_idle_cpu_residency_us.attr, + "cpuidle"); } + put_device(dev_root); } static void lpit_process(u64 begin, u64 end) From patchwork Mon Mar 13 18:28:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 69053 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1355669wrd; Mon, 13 Mar 2023 12:06:53 -0700 (PDT) X-Google-Smtp-Source: AK7set+8ED2c9c8ZgtV84PFNoO9KPNqx1AHCry5bFDjGSxDWzjOae5hzMleHrrXdIAevtiZ5RG7z X-Received: by 2002:a17:90b:23c8:b0:23d:1bbd:9fb5 with SMTP id md8-20020a17090b23c800b0023d1bbd9fb5mr2556255pjb.39.1678734413035; Mon, 13 Mar 2023 12:06:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678734413; cv=none; d=google.com; s=arc-20160816; b=NZvjI8nOA1kL7GVN7+4UQ15JzME3TcFOM7Dl5XoVy39T9eOaYTNyXozKSapWEZ1B+s cQGBqKrN+V+UPDLykE0WofnBrl012Su6dB9AHIwQRFzse7Lbfx9pKcZrwdO/8/8M1hQx wBLWnEtg/21tEkgQnVF4IgJ9qjDO8cjmgPFb8O50sv1XU8mKYA7TmruL1+ZwxK44juPy jN+nvEbeWWFYZzOfThlRaptWydRh2/GvKhg8SWxo6Fnn2+Jbf43osUixY7UaGbTU62aQ 0dKXFYyNCgFgEtY07Y+pf5K0bSHt27Yae7Hc2jnUkzTQZe5a14fz54mz7WMRXzmNj4n1 1I6A== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=UBrA2ZT4KxWf+eQwVb0sJKKe/Wnu1zmuNdh9FNfomyw=; b=QWhoyyOobql40mVaSETDtoMfURFfyj3aMDOAt+oX1cg1PaCWF7jWhNj+lHAXQWKh5v lCmQGKbQSxBwCt8ofsg2Mg+H3YUm5c6X9cSDQ+zAPNjwIDd3a719vVScqqo6Z9NhA+PN IFNqqT/2gT8aheI94hTMndccUbx1ktfEFqtWAE1arZQ80T3Em02nHJS5juJtDH9XXHoq /uitoPkEmFjI9d0JM1S9k8NIeZfMrCKGHwhVDYtlBdRH+yVxLsjL615+yfIbTtgT3/sx iDDJllD0ruU9/ORyYrNEj5wpwbbAyd3q/gqCUrdOom3Vfm7xog15kgUJ9dwd+dsm5zps Gncw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="MXQiJ/sO"; 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 mp11-20020a17090b190b00b0023b56d6c9adsi442171pjb.37.2023.03.13.12.06.40; Mon, 13 Mar 2023 12:06:53 -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="MXQiJ/sO"; 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 S231207AbjCMScr (ORCPT + 99 others); Mon, 13 Mar 2023 14:32:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34584 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231332AbjCMScC (ORCPT ); Mon, 13 Mar 2023 14:32:02 -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 4E3DB84F64; Mon, 13 Mar 2023 11:31: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 ams.source.kernel.org (Postfix) with ESMTPS id D9C33B811DA; Mon, 13 Mar 2023 18:29:57 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 530E2C433D2; Mon, 13 Mar 2023 18:29:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1678732196; bh=Gw4rh6R98Knq0Cq2eoi4WmQjdtPb9YzLDaUDTvYSyIs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MXQiJ/sOvMKEbSllYfbGFpuz/RgUg5CL/sD49Lh4spZhIDmKdLEASRxJu6F9OEWo0 RgzpjuRpFz58tWFPvKUPt4XvmamKX1LQkc1r8RsUMfD5lBfDacU34gNkrwlaT2YVp6 aHyiZWw6EZxnraqJjj3f8guM0QKdDU5EReUhzjm0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: rafael@kernel.org, Greg Kroah-Hartman , Viresh Kumar , Srinivas Pandruvada , Len Brown , linux-pm@vger.kernel.org Subject: [PATCH 03/36] cpufreq: move to use bus_get_dev_root() Date: Mon, 13 Mar 2023 19:28:45 +0100 Message-Id: <20230313182918.1312597-3-gregkh@linuxfoundation.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230313182918.1312597-1-gregkh@linuxfoundation.org> References: <20230313182918.1312597-1-gregkh@linuxfoundation.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2441; i=gregkh@linuxfoundation.org; h=from:subject; bh=Gw4rh6R98Knq0Cq2eoi4WmQjdtPb9YzLDaUDTvYSyIs=; b=owGbwMvMwCRo6H6F97bub03G02pJDCn82aUPCutMtKUNNhs9LOG6X3qh53xLZZPN5WkBnW9v2 0jrfvjZEcvCIMjEICumyPJlG8/R/RWHFL0MbU/DzGFlAhnCwMUpABNpqWeYH8otv4JPk5/ZeF3G 1QuTZM/qX97jxLBg1nPrCtdFvUvuvBAtKcluuPdCf8oEAA== X-Developer-Key: i=gregkh@linuxfoundation.org; a=openpgp; fpr=F4B60CC5BF78C2214A313DCB3147D40DDB2DFB29 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, 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?1760280615962913252?= X-GMAIL-MSGID: =?utf-8?q?1760280615962913252?= Direct access to the struct bus_type dev_root pointer is going away soon so replace that with a call to bus_get_dev_root() instead, which is what it is there for. Cc: "Rafael J. Wysocki" Cc: Viresh Kumar Cc: Srinivas Pandruvada Cc: Len Brown Cc: linux-pm@vger.kernel.org Signed-off-by: Greg Kroah-Hartman Acked-by: Rafael J. Wysocki --- Note, this is a patch that is a prepatory cleanup as part of a larger series of patches that is working on resolving some old driver core design mistakes. It will build and apply cleanly on top of 6.3-rc2 on its own, but I'd prefer if I could take it through my driver-core tree so that the driver core changes can be taken through there for 6.4-rc1. drivers/cpufreq/cpufreq.c | 7 ++++++- drivers/cpufreq/intel_pstate.c | 7 +++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c index 6d8fd3b8dcb5..6ad3119b8e15 100644 --- a/drivers/cpufreq/cpufreq.c +++ b/drivers/cpufreq/cpufreq.c @@ -2932,11 +2932,16 @@ EXPORT_SYMBOL_GPL(cpufreq_unregister_driver); static int __init cpufreq_core_init(void) { struct cpufreq_governor *gov = cpufreq_default_governor(); + struct device *dev_root; if (cpufreq_disabled()) return -ENODEV; - cpufreq_global_kobject = kobject_create_and_add("cpufreq", &cpu_subsys.dev_root->kobj); + dev_root = bus_get_dev_root(&cpu_subsys); + if (dev_root) { + cpufreq_global_kobject = kobject_create_and_add("cpufreq", &dev_root->kobj); + put_device(dev_root); + } BUG_ON(!cpufreq_global_kobject); if (!strlen(default_governor)) diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c index 48a4613cef1e..102cf7f0ac63 100644 --- a/drivers/cpufreq/intel_pstate.c +++ b/drivers/cpufreq/intel_pstate.c @@ -1473,10 +1473,13 @@ static struct kobject *intel_pstate_kobject; static void __init intel_pstate_sysfs_expose_params(void) { + struct device *dev_root = bus_get_dev_root(&cpu_subsys); int rc; - intel_pstate_kobject = kobject_create_and_add("intel_pstate", - &cpu_subsys.dev_root->kobj); + if (dev_root) { + intel_pstate_kobject = kobject_create_and_add("intel_pstate", &dev_root->kobj); + put_device(dev_root); + } if (WARN_ON(!intel_pstate_kobject)) return; From patchwork Mon Mar 13 18:28:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 69016 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1345049wrd; Mon, 13 Mar 2023 11:41:52 -0700 (PDT) X-Google-Smtp-Source: AK7set+W0Haaf/AU+dSGEGCEDUOXeaDLRKVGhThlN2+eaG9OhlcAc/Pd4mfCUaA0E314eiE6lA4H X-Received: by 2002:a17:902:eb4b:b0:19f:2d79:3369 with SMTP id i11-20020a170902eb4b00b0019f2d793369mr6744807pli.38.1678732912271; Mon, 13 Mar 2023 11:41:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678732912; cv=none; d=google.com; s=arc-20160816; b=QzZ4LRsRd49N01/EdJJ5SKEwO02IMkk0x+lJTZxOK+h/RyI89Snmw1dbYUR977e9w+ bWEXTbFiOuUhi+SYTXOzhyl2MRmTOedc20AxW1/b56YlYUU185KHpwgrhw1YSU4rwPu5 XK6f3fIz+iLY9dRKcYOb8PTwIEJOKvVVK7OmCcPUxGfweBNI2s4qs2jTbJeydnBPGjys JpPgRbLxNnUDon9TAT3POm63PFqwJiG+63OWPSZX46hXgUwUTSj5gE2Jj46mDvaMaXSR aaLuTdbAbhL0nr6s1TTWD7CNbznFne+2wUycrVpeMeylbkURMAqkKqN9nUiG+jZXMDJd gD8A== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=b1IdnLFkCC4lvFIZ5nlOceiR4s4CU00g7kZ9MZ7tjHk=; b=qq7DOrRK4XvgpBDra2ahYfPVRFM1R+dDzO41W4G19sSCnTDBvBHorulTeofXPIVau1 zA/CCqD32U7pCuPz08TZoIwKe0oOwufUDxf9M2YTzqTG8AmaLtLtqdYIkCwE0OSch19S bGcjz+7mWKaJGBqiWDnHti03dL9OeRoX8b2HfMRhpS4omQ9545Z2h7+y+RM5O8hjFnFH OgpGaWGcpx0fRQLHWXsFWPoLfzEh+QVDdD5XhI5NJkW4DyM1L84dkIemhJvUVV0bcUOY B7eHZGGdf0OirXmBEcT25Iock/PGxhS4i2gkwp+sYOCHWjPOOE3LxggK+qcBelGeB3BZ 2abQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=rOW7zAdt; 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 kr14-20020a170903080e00b0019ab692fc8fsi327206plb.612.2023.03.13.11.41.39; Mon, 13 Mar 2023 11:41:52 -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=rOW7zAdt; 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 S231263AbjCMSbB (ORCPT + 99 others); Mon, 13 Mar 2023 14:31:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34576 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231220AbjCMSao (ORCPT ); Mon, 13 Mar 2023 14:30:44 -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 720A98090E; Mon, 13 Mar 2023 11:30:10 -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 C3FBD61476; Mon, 13 Mar 2023 18:30:02 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D1964C433EF; Mon, 13 Mar 2023 18:30:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1678732202; bh=iWixNYysEt/57rzWPvGF+tU4T3O5fIRqKfjVPRFzTiE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rOW7zAdt3atmqn55xq4wkAhth6yviBG8RItVivIzGD3S2HYWjNpvHud9HHQrkbhsT JDVDHBPnIUb+T5ndB+erKVt1PixDzZYSOHzSDBVuBV3Q8SpButNkXzWeJwEdRz7i7a 9Avkl8tTjbaQ6lY42jQeYvqjgQwzOZpn4xrW54E4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: rafael@kernel.org, Greg Kroah-Hartman , Hans de Goede , Mark Gross , platform-driver-x86@vger.kernel.org Subject: [PATCH 04/36] platform/x86: ibm_rtl: move to use bus_get_dev_root() Date: Mon, 13 Mar 2023 19:28:46 +0100 Message-Id: <20230313182918.1312597-4-gregkh@linuxfoundation.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230313182918.1312597-1-gregkh@linuxfoundation.org> References: <20230313182918.1312597-1-gregkh@linuxfoundation.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1912; i=gregkh@linuxfoundation.org; h=from:subject; bh=iWixNYysEt/57rzWPvGF+tU4T3O5fIRqKfjVPRFzTiE=; b=owGbwMvMwCRo6H6F97bub03G02pJDCn82aWbzuQ+71jMOT/uaVDffRvPid97S9bPWt38uzBO9 YCnv2FERywLgyATg6yYIsuXbTxH91ccUvQytD0NM4eVCWQIAxenAEykq55hwe7DE9aL6kisd5Cb dOWFixnPmQU6qgzzdFuf85+qeHxJYq2xITff3l1CW8UzAQ== X-Developer-Key: i=gregkh@linuxfoundation.org; a=openpgp; fpr=F4B60CC5BF78C2214A313DCB3147D40DDB2DFB29 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, 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?1760279042288762273?= X-GMAIL-MSGID: =?utf-8?q?1760279042288762273?= Direct access to the struct bus_type dev_root pointer is going away soon so replace that with a call to bus_get_dev_root() instead, which is what it is there for. Cc: Hans de Goede Cc: Mark Gross Cc: platform-driver-x86@vger.kernel.org Signed-off-by: Greg Kroah-Hartman Acked-by: Hans de Goede --- Note, this is a patch that is a prepatory cleanup as part of a larger series of patches that is working on resolving some old driver core design mistakes. It will build and apply cleanly on top of 6.3-rc2 on its own, but I'd prefer if I could take it through my driver-core tree so that the driver core changes can be taken through there for 6.4-rc1. drivers/platform/x86/ibm_rtl.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/drivers/platform/x86/ibm_rtl.c b/drivers/platform/x86/ibm_rtl.c index 5fc665f7d9b3..2ab7d9ac542d 100644 --- a/drivers/platform/x86/ibm_rtl.c +++ b/drivers/platform/x86/ibm_rtl.c @@ -199,16 +199,26 @@ static int rtl_setup_sysfs(void) { ret = subsys_system_register(&rtl_subsys, NULL); if (!ret) { - for (i = 0; rtl_attributes[i]; i ++) - device_create_file(rtl_subsys.dev_root, rtl_attributes[i]); + struct device *dev_root = bus_get_dev_root(&rtl_subsys); + + if (dev_root) { + for (i = 0; rtl_attributes[i]; i ++) + device_create_file(dev_root, rtl_attributes[i]); + put_device(dev_root); + } } return ret; } static void rtl_teardown_sysfs(void) { + struct device *dev_root = bus_get_dev_root(&rtl_subsys); int i; - for (i = 0; rtl_attributes[i]; i ++) - device_remove_file(rtl_subsys.dev_root, rtl_attributes[i]); + + if (dev_root) { + for (i = 0; rtl_attributes[i]; i ++) + device_remove_file(dev_root, rtl_attributes[i]); + put_device(dev_root); + } bus_unregister(&rtl_subsys); } From patchwork Mon Mar 13 18:28:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 69046 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1348632wrd; Mon, 13 Mar 2023 11:50:59 -0700 (PDT) X-Google-Smtp-Source: AK7set/SXCaIM86aauMRUR7CO5t0QFluywJw4VmGmh6/4ZK2rCnK8aqkYqEmyMK13f87L3sMNDj5 X-Received: by 2002:aa7:9819:0:b0:624:a58a:d32 with SMTP id e25-20020aa79819000000b00624a58a0d32mr3398131pfl.4.1678733459680; Mon, 13 Mar 2023 11:50:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678733459; cv=none; d=google.com; s=arc-20160816; b=xdF26eiLimfUKJsKtPXurpCJE6Vbs6cUGa7RD0y9RRxsV2+bxeAGuwYY80fW9zA/ae T3TX1x14G7khRLnqZWgUSS6uAxsgyVfm5rU3bJfacvhDFhKPJ2fo4+6dNrs0XuwnWlBa G785FCTb6pw+Gef7jFNpuiODDHxfOoIk4Dspmo29CPsxP2TZXXP19Yw4E/SqbkZSm1B3 LPsULEfLWfP6sJzE0fJb2FzQT846LaqLA738wgIVajojU6XwMO9Dq1C4gZJ2OL+/schk kJeIV/Kqqj5WlUvZjiLeoHFYgi5N6JTLZa6VdXUkLbbwljG3uHazjyX/4WsXslcn8AP6 AE4A== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Fo6ScvWcTgGS2yu1ENiprpVicABBRrXRBNbKK73xDDI=; b=Z3bWIGlJM/hgJEd4ZGQYgsfV1eu5CEpazQ71w2SRyVv2lxgjG3+OrVufCSC+Fn0L5a sULfYlgw5E6B8bsk7Yw/r+CAolezAP9XiWcMEv9dmZky87e/UzUYi3s8rq+maxpOtymm d5h5iIG4rTR7/ZSVd1ctU9PJeApypQ8OsLZZX+WbPgUui8ZOv8hqgmJ5ecbO7Gn9JHim Nn53xCaQqg1JHUYctq7gyUMOnHovsw2nfyK5o2D2X5ox9fT9lj5CAigxclHVhMgTtlzi 6qXqCSXI/CXgKdsUmQ2Djao9axDbtbTOQ+C/zF2jao/FCM7bjRv+XSzJ6F0FLLLEJi2d mLqQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=1HRDHQyI; 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 70-20020a630449000000b00503355265d2si136889pge.733.2023.03.13.11.50.46; Mon, 13 Mar 2023 11:50:59 -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=1HRDHQyI; 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 S231350AbjCMSbf (ORCPT + 99 others); Mon, 13 Mar 2023 14:31:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34958 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230337AbjCMSay (ORCPT ); Mon, 13 Mar 2023 14:30:54 -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 E61C225B81; Mon, 13 Mar 2023 11:30:26 -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 0EA29B811E0; Mon, 13 Mar 2023 18:30:06 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 77C7EC4339C; Mon, 13 Mar 2023 18:30:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1678732204; bh=7dR6cgnoc5L5P7fViXWBZ/SR4m9IirhaXpa6nNyHMUE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1HRDHQyIUW6F//NrwkovKrkyEyPTWHsGMf1FPjZf6MyMnk7UjvPitAncqoHS9PtjS lJKQXZcblP9+4QO2xqW3MTrVU9mlJ5RkjHDdX77pKt2KVCEEQ/DDVdKiOhEWEdmqyl S0GXPBaMO3REmPNhZO/0K1POiRfFkPtpc1QkxgEE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: rafael@kernel.org, Greg Kroah-Hartman , Srinivas Pandruvada , Hans de Goede , Mark Gross , platform-driver-x86@vger.kernel.org Subject: [PATCH 05/36] platform/x86: intel-uncore-freq: move to use bus_get_dev_root() Date: Mon, 13 Mar 2023 19:28:47 +0100 Message-Id: <20230313182918.1312597-5-gregkh@linuxfoundation.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230313182918.1312597-1-gregkh@linuxfoundation.org> References: <20230313182918.1312597-1-gregkh@linuxfoundation.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1924; i=gregkh@linuxfoundation.org; h=from:subject; bh=7dR6cgnoc5L5P7fViXWBZ/SR4m9IirhaXpa6nNyHMUE=; b=owGbwMvMwCRo6H6F97bub03G02pJDCn82WVuLWdOs8k7r5U84VfcscL86aEZjNVOp2KM6q99D awQvnOjI5aFQZCJQVZMkeXLNp6j+ysOKXoZ2p6GmcPKBDKEgYtTACbCZcUwP+3jldVJH+buKn/1 qdlTKcqyi73eh2HBMccEJ+bJ+zIUq998O9e2z+iRY95zAA== X-Developer-Key: i=gregkh@linuxfoundation.org; a=openpgp; fpr=F4B60CC5BF78C2214A313DCB3147D40DDB2DFB29 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, 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?1760279616145788318?= X-GMAIL-MSGID: =?utf-8?q?1760279616145788318?= Direct access to the struct bus_type dev_root pointer is going away soon so replace that with a call to bus_get_dev_root() instead, which is what it is there for. Cc: Srinivas Pandruvada Cc: Hans de Goede Cc: Mark Gross Cc: platform-driver-x86@vger.kernel.org Signed-off-by: Greg Kroah-Hartman Acked-by: Srinivas Pandruvada Acked-by: Hans de Goede --- Note, this is a patch that is a prepatory cleanup as part of a larger series of patches that is working on resolving some old driver core design mistakes. It will build and apply cleanly on top of 6.3-rc2 on its own, but I'd prefer if I could take it through my driver-core tree so that the driver core changes can be taken through there for 6.4-rc1. .../intel/uncore-frequency/uncore-frequency-common.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/drivers/platform/x86/intel/uncore-frequency/uncore-frequency-common.c b/drivers/platform/x86/intel/uncore-frequency/uncore-frequency-common.c index cb24de9e97dc..1a300e14f350 100644 --- a/drivers/platform/x86/intel/uncore-frequency/uncore-frequency-common.c +++ b/drivers/platform/x86/intel/uncore-frequency/uncore-frequency-common.c @@ -224,9 +224,15 @@ int uncore_freq_common_init(int (*read_control_freq)(struct uncore_data *data, u uncore_write = write_control_freq; uncore_read_freq = read_freq; - if (!uncore_root_kobj) - uncore_root_kobj = kobject_create_and_add("intel_uncore_frequency", - &cpu_subsys.dev_root->kobj); + if (!uncore_root_kobj) { + struct device *dev_root = bus_get_dev_root(&cpu_subsys); + + if (dev_root) { + uncore_root_kobj = kobject_create_and_add("intel_uncore_frequency", + &dev_root->kobj); + put_device(dev_root); + } + } if (uncore_root_kobj) ++uncore_instance_count; mutex_unlock(&uncore_lock); From patchwork Mon Mar 13 18:28:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 69021 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1346180wrd; Mon, 13 Mar 2023 11:44:40 -0700 (PDT) X-Google-Smtp-Source: AK7set/6vpN9S+d/mu33fJDZGZR7R9o9YVx/CIPY3MYVPYIVLXW4SxT++eOHYxjChEHvGzEZEQvB X-Received: by 2002:a17:902:da90:b0:19a:a0d0:10f0 with SMTP id j16-20020a170902da9000b0019aa0d010f0mr43256099plx.23.1678733079988; Mon, 13 Mar 2023 11:44:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678733079; cv=none; d=google.com; s=arc-20160816; b=eis/+oCnuaqbzi8y1OnqlpkAQ0H98iCvsYvb3pQ2OyfuUoWx3eDPAPTtU8kR8vrRTE hprcTxlx2wGe85XsSL2WnUUczLxKeLLebPh2R3d8gbOOTfoMIbM5bZGNQAtDjfTaowZr J/mLmabmK9TMyEtH8+muLPx2vG1p9nAUbAOrF2t/Kdu1OL614y+Ye4FyT0TsSFV4eF58 cixgGdyi7F0Sz+8myEX4pvrzEIoWCr1Ry7+4UO6pvqmYj4GhGWTw/kopealZ/zPUN1LC 757jdtl53jyShA3tx4NnnSQCJyHfjUmBU9rB3SGSIRTnec03kF0RU4XEGmJOIfIqkToV /Y8A== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=wKbJNoFewQOBw/Yhn+9USSdnUMxcvDjicIZPPuOv8v4=; b=ds6tQbIL1hJNbFod6NNp3cu+H/D0v2M/1gLYQA2z+wn29MQfldu4ZLhjY4B5rFBmqv Yvt68VWU/NYmxiSqw3IsfsHlO0nicsG3yUsGRW20qY4cQlH1VGm/lKxshLIY8yFruWaE C0dw7uhZ2MY9wjuiBhVu6DAqXs28gN6AJM/Db6wRM4UsaL3F5g61Lvh1Acno/ILgKZiK TfpvxPq0cSNDuHkVWqJVC+CbK93AmqTIeR3S4h85RgPXjNsNTm0WNWViS40A1ot80ypy PI62d8vYTcby2pkB8EYfFRE8s5RPw9nLWoiZHdd2axKa6WXdQb5x5p0ls4bcYu/UTs8g EMnQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Ab6OR33c; 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 n23-20020a170902969700b0019f232be634si359103plp.347.2023.03.13.11.44.27; Mon, 13 Mar 2023 11:44:39 -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=Ab6OR33c; 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 S231251AbjCMSbS (ORCPT + 99 others); Mon, 13 Mar 2023 14:31:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34198 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230512AbjCMSar (ORCPT ); Mon, 13 Mar 2023 14:30:47 -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 76DEE15179; Mon, 13 Mar 2023 11:30:20 -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 F21CF6147D; Mon, 13 Mar 2023 18:30:07 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 14EE6C4339C; Mon, 13 Mar 2023 18:30:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1678732207; bh=hXLKonMm2sNxAWG39959mWWF++bz6QKPSxDIBNJCa+k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ab6OR33cN0NvU+6g9zXWYvinHqjfhlr0RvqZqfI7FeYbPnSOY27hkdBPgdUe7B7pe hd3L1GyUMfQf2/hLNWmByUFkExGLumyWwXoqB7zn5mDFlXVYvHv/lI2ebq2gej16Sc FyBvyj89uQPe6Xjp317pH+/OcPBdcZCQFKy4TKTU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: rafael@kernel.org, Greg Kroah-Hartman , Daniel Lezcano , linux-pm@vger.kernel.org Subject: [PATCH 06/36] cpuidle: move to use bus_get_dev_root() Date: Mon, 13 Mar 2023 19:28:48 +0100 Message-Id: <20230313182918.1312597-6-gregkh@linuxfoundation.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230313182918.1312597-1-gregkh@linuxfoundation.org> References: <20230313182918.1312597-1-gregkh@linuxfoundation.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2943; i=gregkh@linuxfoundation.org; h=from:subject; bh=hXLKonMm2sNxAWG39959mWWF++bz6QKPSxDIBNJCa+k=; b=owGbwMvMwCRo6H6F97bub03G02pJDCn82WVLjjRum3e46v65hebO/hNqY6eZsRx/8JQt6IFe5 pKdzu+LO2JZGASZGGTFFFm+bOM5ur/ikKKXoe1pmDmsTCBDGLg4BWAi7p0MC5beqH1Sx1G8to+5 UepNkvmyoEc3vzEs6Epd4rBanU9C4mzqmtvV/lPeGarnAgA= X-Developer-Key: i=gregkh@linuxfoundation.org; a=openpgp; fpr=F4B60CC5BF78C2214A313DCB3147D40DDB2DFB29 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, 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?1760279218023292235?= X-GMAIL-MSGID: =?utf-8?q?1760279218023292235?= Direct access to the struct bus_type dev_root pointer is going away soon so replace that with a call to bus_get_dev_root() instead, which is what it is there for. This allows us to clean up the cpuidle_add_interface() call a bit as it was only called in one place, with the same argument so just put that into the function itself. Note that cpuidle_remove_interface() should also probably be removed in the future as there are no callers of it for some reason. Cc: "Rafael J. Wysocki" Cc: Daniel Lezcano Cc: linux-pm@vger.kernel.org Signed-off-by: Greg Kroah-Hartman --- Note, this is a patch that is a prepatory cleanup as part of a larger series of patches that is working on resolving some old driver core design mistakes. It will build and apply cleanly on top of 6.3-rc2 on its own, but I'd prefer if I could take it through my driver-core tree so that the driver core changes can be taken through there for 6.4-rc1. drivers/cpuidle/cpuidle.c | 2 +- drivers/cpuidle/cpuidle.h | 2 +- drivers/cpuidle/sysfs.c | 12 +++++++++--- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c index 0b00f21cefe3..8e929f6602ce 100644 --- a/drivers/cpuidle/cpuidle.c +++ b/drivers/cpuidle/cpuidle.c @@ -808,7 +808,7 @@ static int __init cpuidle_init(void) if (cpuidle_disabled()) return -ENODEV; - return cpuidle_add_interface(cpu_subsys.dev_root); + return cpuidle_add_interface(); } module_param(off, int, 0444); diff --git a/drivers/cpuidle/cpuidle.h b/drivers/cpuidle/cpuidle.h index 9f336af17fa6..52701d9588f1 100644 --- a/drivers/cpuidle/cpuidle.h +++ b/drivers/cpuidle/cpuidle.h @@ -30,7 +30,7 @@ extern int cpuidle_switch_governor(struct cpuidle_governor *gov); struct device; -extern int cpuidle_add_interface(struct device *dev); +extern int cpuidle_add_interface(void); extern void cpuidle_remove_interface(struct device *dev); extern int cpuidle_add_device_sysfs(struct cpuidle_device *device); extern void cpuidle_remove_device_sysfs(struct cpuidle_device *device); diff --git a/drivers/cpuidle/sysfs.c b/drivers/cpuidle/sysfs.c index 48948b171749..84e4946f1072 100644 --- a/drivers/cpuidle/sysfs.c +++ b/drivers/cpuidle/sysfs.c @@ -119,11 +119,17 @@ static struct attribute_group cpuidle_attr_group = { /** * cpuidle_add_interface - add CPU global sysfs attributes - * @dev: the target device */ -int cpuidle_add_interface(struct device *dev) +int cpuidle_add_interface(void) { - return sysfs_create_group(&dev->kobj, &cpuidle_attr_group); + struct device *dev_root = bus_get_dev_root(&cpu_subsys); + int retval = -EINVAL; + + if (dev_root) { + retval = sysfs_create_group(&dev_root->kobj, &cpuidle_attr_group); + put_device(dev_root); + } + return retval; } /** From patchwork Mon Mar 13 18:28:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 69023 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1346379wrd; Mon, 13 Mar 2023 11:45:09 -0700 (PDT) X-Google-Smtp-Source: AK7set/Oubp0Cicc7OnDZVILtAM49YxaB7dJHFJM1rrDUBIbN1cf+8lVcOc27mqhd217YVcPWiVi X-Received: by 2002:a17:90b:1e09:b0:237:e1d2:c65e with SMTP id pg9-20020a17090b1e0900b00237e1d2c65emr37357989pjb.4.1678733109312; Mon, 13 Mar 2023 11:45:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678733109; cv=none; d=google.com; s=arc-20160816; b=f3ndLAjoauUj7g+NPdXQNM+pf53/+Lb/zxQptx4XEDKDR1qB02veAohONN/Ks+5T7n fBJRveol7zZkCEWmKEhPDmi9lYGza3dB9/NalHgHvvzIxVrJQij5pG0QHWp6UiR6G9eh /twt+4uYvZtQB8DktapB3n/ltZwoutHnDXPVpT2+T5K9+kG5n5f69cMccHuFGlloXaWl WxLHdszN+sAQOFc1mijyHXcZ8xqrbQeNfUuRI9xt92m/VQwNn7c2jKvu8NsyaRTJMoID +f2e6t4Yv3bfxgi7egTkJnKeLuA5IWu/1UMMbb+nrXLGJgpA1yg4v/eagth5i7+e8UTC H4hA== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=KtgW2IxB5Qu2TIAIX9duGoDGr5105JUxeL2Gzoodci0=; b=mEJtTdIJBGlsQ885/uzwRujWFSoPkeBVr/jlL5U2tD1NdTwZ7W4VBm0U8BHdvFcluK b+Q4+h96dI7l9RlK5NsQq6YgkUIIX1/5DvKPzt9LvXB8uW1t2yI6FpVwOF1uGTbs+Qcq eOTv3hz002mdvr5t6s7KqEvVMJ51TAS+L1hBJiPUmsrSGH4oMEPKBcbuSKlNjGjPQleE sO5qwI+4wEKPr1mB520SAuTekmn3qLBba9jGjApO3pYMd8Vtd39k2Ej1L0LFfjhsry/+ aQGXieRXNkKkinPxD/tInrB/n/7LDvpSExXyPa4P5viLCil/tMrJ06XgQNniucwo1eJA G4Qw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=okHtIWSW; 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 j16-20020a17090a7e9000b00237413f8c6esi341117pjl.154.2023.03.13.11.44.56; Mon, 13 Mar 2023 11:45:09 -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=okHtIWSW; 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 S231191AbjCMSbc (ORCPT + 99 others); Mon, 13 Mar 2023 14:31:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34542 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231148AbjCMSay (ORCPT ); Mon, 13 Mar 2023 14:30:54 -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 B9B197AA7 for ; Mon, 13 Mar 2023 11:30:26 -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 6D464B811EA for ; Mon, 13 Mar 2023 18:30:11 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B9939C4339B; Mon, 13 Mar 2023 18:30:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1678732210; bh=+YNkgrwftY9hNEquBq/R0SACBur2SPzGk0mDyKZ5lx8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=okHtIWSWvjP6x5fU3oAPAe28nKfepeMrYZE5gY44jigwo8Pvy+eFSWGY1iKI7084c eMJD8wiSOfUIW9x7X49LQ+8Y7WVN1aNZfFGpuajpT74d/A4XzeTDb+ESW3l9gqZaae REtLOq/OsvUMQzFZNWfGSbFjznNHPfmtc3eVaD4E= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: rafael@kernel.org, Greg Kroah-Hartman , Thomas Gleixner , Valentin Schneider , Phil Auld , Steven Price , Juri Lelli , Vincent Donnefort , Kuppuswamy Sathyanarayanan , "Jason A. Donenfeld" Subject: [PATCH 07/36] cpu/hotplug: move to use bus_get_dev_root() Date: Mon, 13 Mar 2023 19:28:49 +0100 Message-Id: <20230313182918.1312597-7-gregkh@linuxfoundation.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230313182918.1312597-1-gregkh@linuxfoundation.org> References: <20230313182918.1312597-1-gregkh@linuxfoundation.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2278; i=gregkh@linuxfoundation.org; h=from:subject; bh=+YNkgrwftY9hNEquBq/R0SACBur2SPzGk0mDyKZ5lx8=; b=owGbwMvMwCRo6H6F97bub03G02pJDCn82WVXq/7d+B2dX5lz5v3EZVFBndty901+w2ix6kzpR Z25s9VDOmJZGASZGGTFFFm+bOM5ur/ikKKXoe1pmDmsTCBDGLg4BWAid9UY5vs++fYyJs9zXcVc /QmiC8tnv/J5859hwYK2x0G6ld+vWt9xu+etX3nmloTaOgA= X-Developer-Key: i=gregkh@linuxfoundation.org; a=openpgp; fpr=F4B60CC5BF78C2214A313DCB3147D40DDB2DFB29 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, 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?1760279249195525792?= X-GMAIL-MSGID: =?utf-8?q?1760279249195525792?= Direct access to the struct bus_type dev_root pointer is going away soon so replace that with a call to bus_get_dev_root() instead, which is what it is there for. Cc: Thomas Gleixner Cc: Valentin Schneider Cc: Phil Auld Cc: Steven Price Cc: Juri Lelli Cc: Greg Kroah-Hartman Cc: Vincent Donnefort Cc: Kuppuswamy Sathyanarayanan Cc: "Jason A. Donenfeld" Signed-off-by: Greg Kroah-Hartman Reviewed-by: Thomas Gleixner --- Note, this is a patch that is a prepatory cleanup as part of a larger series of patches that is working on resolving some old driver core design mistakes. It will build and apply cleanly on top of 6.3-rc2 on its own, but I'd prefer if I could take it through my driver-core tree so that the driver core changes can be taken through there for 6.4-rc1. kernel/cpu.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/kernel/cpu.c b/kernel/cpu.c index 6c0a92ca6bb5..c59b73d13a3a 100644 --- a/kernel/cpu.c +++ b/kernel/cpu.c @@ -2569,22 +2569,33 @@ static const struct attribute_group cpuhp_smt_attr_group = { static int __init cpu_smt_sysfs_init(void) { - return sysfs_create_group(&cpu_subsys.dev_root->kobj, - &cpuhp_smt_attr_group); + struct device *dev_root; + int ret = -ENODEV; + + dev_root = bus_get_dev_root(&cpu_subsys); + if (dev_root) { + ret = sysfs_create_group(&dev_root->kobj, &cpuhp_smt_attr_group); + put_device(dev_root); + } + return ret; } static int __init cpuhp_sysfs_init(void) { + struct device *dev_root; int cpu, ret; ret = cpu_smt_sysfs_init(); if (ret) return ret; - ret = sysfs_create_group(&cpu_subsys.dev_root->kobj, - &cpuhp_cpu_root_attr_group); - if (ret) - return ret; + dev_root = bus_get_dev_root(&cpu_subsys); + if (dev_root) { + ret = sysfs_create_group(&dev_root->kobj, &cpuhp_cpu_root_attr_group); + put_device(dev_root); + if (ret) + return ret; + } for_each_possible_cpu(cpu) { struct device *dev = get_cpu_device(cpu); From patchwork Mon Mar 13 18:28:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 69052 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1354572wrd; Mon, 13 Mar 2023 12:04:33 -0700 (PDT) X-Google-Smtp-Source: AK7set+x15MAoBHAriCIwhh0KCUXO550ecSCChY+iQeODppdNOZUk+UXVeiqzsO16nWMnByd+h0Z X-Received: by 2002:a62:794e:0:b0:623:84d9:4c8 with SMTP id u75-20020a62794e000000b0062384d904c8mr5983324pfc.17.1678734273567; Mon, 13 Mar 2023 12:04:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678734273; cv=none; d=google.com; s=arc-20160816; b=uRYqNaxn9LZeq49Qkc+wBEauCT6Prnh96uk8q3Bye8yTqOmmvhoTOS02wnBTa4SiK9 5xZDn0YmponfDUUDuQ82PsCLnypVAjzI4vVMtR0nJXE5JMFqhf5xqaN6SUPf4I6bSbhK 2i3da2MJVJnwLLbsg0WoMFLeMd3K6zAPGmPKhiOeOocakdhrYC6fKLTu+yeWLW9z0psP 42rbxBZqJq71pfROhaKv/DC4zcdKX9ZnIf7z+qar1wkPt8/T5KcWV7fKB3BRWpTjjMXo n9nx1WDfEtjk7suFWUZsNAIzZmnLtrYyeHLWTAnxqK+7h+QyfMYJmQMfndqsXFqkBKGE HNgA== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=3tKA2a1Mny6uOhTdV5G4YZKcWCfAFXD/biTdTfLcia4=; b=ej2QFTDPT8jMGI2CzkcMuvLv+lrchiyx75arMi3XcB+QDU3Db7WLfx2fkkGbqiiLjZ 8u/t9qnPqJpabI5WTF+IVFnZuJ/YheVPUvT3dXpo0vpN2lOawzwKO8H7Huxo0t04fNLI I1ZU05yJX4EXNK21FafWG2yRL0N/ihm9JInD5Wp5SPaPecsEM4mkgv0coLIkHaXgNu3+ pClHF4VC5yaKEQZ1FzBMmRKzjtKqEXMUohNqez2CKBca8qFA+go9ihl30yUlPITzpTan JcV7FZtbcFtmfa5XRq2z2nTT9OFPB07AlyoPBKDj9d4s+TlGK+BPWma7LU2fa0Z7q8Hf 5qRQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=N6WvZTgn; 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 bs126-20020a632884000000b005074cff89c7si192159pgb.421.2023.03.13.12.04.20; Mon, 13 Mar 2023 12:04:33 -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=N6WvZTgn; 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 S231401AbjCMScy (ORCPT + 99 others); Mon, 13 Mar 2023 14:32:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35178 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231231AbjCMScS (ORCPT ); Mon, 13 Mar 2023 14:32:18 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4126785349 for ; Mon, 13 Mar 2023 11:31:13 -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 4E85461486 for ; Mon, 13 Mar 2023 18:30:13 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5EFB9C4339B; Mon, 13 Mar 2023 18:30:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1678732212; bh=29/VsP7QLy9amuWzKxZWbyxjbLYD3mVtVi2dWWJd14U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=N6WvZTgnyjdnIciW+XJpqREAg/Sv8CNZ5h7L49crFuJX9JpZK557g+J2i6Rcj0+lH HB0ldD4o4+vDS7opAYeEgo4MehXRRg9H5eQlp8Ul+Ifl+nZhUHaZMVl9PtOPNmV6Pn xR4klK47fvEJw/UgeP5px6cwCi1Q8Qw7JTWTGJq0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: rafael@kernel.org, Greg Kroah-Hartman , Tejun Heo , Lai Jiangshan Subject: [PATCH 08/36] workqueue: move to use bus_get_dev_root() Date: Mon, 13 Mar 2023 19:28:50 +0100 Message-Id: <20230313182918.1312597-8-gregkh@linuxfoundation.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230313182918.1312597-1-gregkh@linuxfoundation.org> References: <20230313182918.1312597-1-gregkh@linuxfoundation.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1455; i=gregkh@linuxfoundation.org; h=from:subject; bh=29/VsP7QLy9amuWzKxZWbyxjbLYD3mVtVi2dWWJd14U=; b=owGbwMvMwCRo6H6F97bub03G02pJDCn82WXzlwgI/9nCY/WtQDCZfW/SI+PPK5Rjuld+2JLiX tG9hTO1I5aFQZCJQVZMkeXLNp6j+ysOKXoZ2p6GmcPKBDKEgYtTACZybDLDfLc1Wydbs4mrXxSf EVkRH3udN37SbYYFa+4uceEWOGdeOs2gNlZ15Yq6d3vuAAA= X-Developer-Key: i=gregkh@linuxfoundation.org; a=openpgp; fpr=F4B60CC5BF78C2214A313DCB3147D40DDB2DFB29 X-Spam-Status: No, score=-7.1 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?1760280469994753837?= X-GMAIL-MSGID: =?utf-8?q?1760280469994753837?= Direct access to the struct bus_type dev_root pointer is going away soon so replace that with a call to bus_get_dev_root() instead, which is what it is there for. Cc: Tejun Heo Cc: Lai Jiangshan Signed-off-by: Greg Kroah-Hartman --- Note, this is a patch that is a prepatory cleanup as part of a larger series of patches that is working on resolving some old driver core design mistakes. It will build and apply cleanly on top of 6.3-rc2 on its own, but I'd prefer if I could take it through my driver-core tree so that the driver core changes can be taken through there for 6.4-rc1. kernel/workqueue.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/kernel/workqueue.c b/kernel/workqueue.c index b8b541caed48..209917792fa4 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c @@ -5826,13 +5826,19 @@ static struct device_attribute wq_sysfs_cpumask_attr = static int __init wq_sysfs_init(void) { + struct device *dev_root; int err; err = subsys_virtual_register(&wq_subsys, NULL); if (err) return err; - return device_create_file(wq_subsys.dev_root, &wq_sysfs_cpumask_attr); + dev_root = bus_get_dev_root(&wq_subsys); + if (dev_root) { + err = device_create_file(dev_root, &wq_sysfs_cpumask_attr); + put_device(dev_root); + } + return err; } core_initcall(wq_sysfs_init); From patchwork Mon Mar 13 18:28:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 69045 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1348332wrd; Mon, 13 Mar 2023 11:50:11 -0700 (PDT) X-Google-Smtp-Source: AK7set/54gcZN4NpY+CWmV7DNLvCSxYItx2OUDxXVeU1qdPuqI+WhWT9fBGckrwE7AzZZANqbp2Z X-Received: by 2002:a17:902:bb90:b0:19e:524f:272f with SMTP id m16-20020a170902bb9000b0019e524f272fmr27985349pls.42.1678733410766; Mon, 13 Mar 2023 11:50:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678733410; cv=none; d=google.com; s=arc-20160816; b=WQF3VH2Bt3n9h2nfRiI4hHkkXcqg50UeF6zXhPyXmlxSrmCWEo95mJkLu8B0l3SUCC 63wvRc1vH00vkl1ck4vUCb/+lFoOiGPIxTq+wKGoig4hBTeCrfyE5e+27YTlLfZysnu+ a/mDB2xOqrggvD6Gs1E5CPB0+v1PHccoGr04ZQlOYDEdwMAuQnulPJV06shThZZXLy69 OnNnlOOXghX/ADEuS92tRI5B6BXfEbZ96vITGLNWlGeK8nxv2WAGDjDhfKB9+nuA8kDm 9PE91WAgRbn/KPItjRIdaKNKpMKqox1lxdpSNoaKiEivYcqy+W58zwEDiHPwLK+1CAV9 iLaw== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=DclcoLcbYEInevLZGnqpx9o3+rpUr/DZKGtovWJHrNQ=; b=fPebrc0gjEwtLRGNjduAKcthWVPELIJAPe8bnNsJ9OL6PxswIzuPr5vzhhlkwxYau6 zyQtp45GEOUB3WOCuBFP5O65Ss8p859kLKtJVPnxo/ZVInEXhS+YVvNQMaduFfe47fUn VbD0ixGje9EUVX2C2KMdkk4Ppf+DHZjkMNESnM/+U3Ge2FIujUAsj9kScaHjc0LSWb/Z rkq5eO697I1zLDDP0B+AIxHeVqReyAZVKKE+UeyFyrGV2NSDdKvk2hBDIVWynU9vcbn4 9QjxY6qBpXne2+Vr8NHRpECHbb1GqXoGxZXYeuV+LXV06opaM8Lcqc4capY1z+PMC3l7 bKUQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="F9T/FLVr"; 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 t5-20020a170902e84500b0019cb21ef999si401522plg.152.2023.03.13.11.49.57; Mon, 13 Mar 2023 11:50:10 -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="F9T/FLVr"; 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 S231374AbjCMSdX (ORCPT + 99 others); Mon, 13 Mar 2023 14:33:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33800 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231314AbjCMScg (ORCPT ); Mon, 13 Mar 2023 14:32:36 -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 5A07C85691 for ; Mon, 13 Mar 2023 11:31:30 -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 F2E07B811C0 for ; Mon, 13 Mar 2023 18:30:16 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6BFACC433EF; Mon, 13 Mar 2023 18:30:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1678732215; bh=gLzKe4oxvagH/VFQPBqBGcEQROYxgF1p5m/hDhke2hc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=F9T/FLVrOt4wSkN9Od4KU0TV6PCDVYzrTZtGNhT73tJMi+ne1oU2QYvvjULwH0P19 +vYmTlzVJeA01UETaERBzd6OjA3oJJxGE8fKcYcL1sbqTYczo68aALj3USwO8RGlpz 8q9DyDdu3dCsEeBialG+LXZMRl/RcWDrHrLSREOk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: rafael@kernel.org, Greg Kroah-Hartman , Borislav Petkov , Thomas Gleixner , Ingo Molnar , Dave Hansen , x86@kernel.org, "H. Peter Anvin" Subject: [PATCH 09/36] x86/microcode: move to use bus_get_dev_root() Date: Mon, 13 Mar 2023 19:28:51 +0100 Message-Id: <20230313182918.1312597-9-gregkh@linuxfoundation.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230313182918.1312597-1-gregkh@linuxfoundation.org> References: <20230313182918.1312597-1-gregkh@linuxfoundation.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1974; i=gregkh@linuxfoundation.org; h=from:subject; bh=gLzKe4oxvagH/VFQPBqBGcEQROYxgF1p5m/hDhke2hc=; b=owGbwMvMwCRo6H6F97bub03G02pJDCn82eUcHup7NCM6o6zrhO4kJLdd03y4wtV4mSlLvNKZ1 fJFO8w6YlkYBJkYZMUUWb5s4zm6v+KQopeh7WmYOaxMIEMYuDgFYCLpugyz2S2Smkq552qt26Ti 9d96nvL8rpk9DPP0ntjs+Xa2PfFnbMAO5gMi8W21bSEA X-Developer-Key: i=gregkh@linuxfoundation.org; a=openpgp; fpr=F4B60CC5BF78C2214A313DCB3147D40DDB2DFB29 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, 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?1760279564459764630?= X-GMAIL-MSGID: =?utf-8?q?1760279564459764630?= Direct access to the struct bus_type dev_root pointer is going away soon so replace that with a call to bus_get_dev_root() instead, which is what it is there for. Cc: Borislav Petkov Cc: Thomas Gleixner Cc: Ingo Molnar Cc: Dave Hansen Cc: x86@kernel.org Cc: "H. Peter Anvin" Signed-off-by: Greg Kroah-Hartman --- Note, this is a patch that is a prepatory cleanup as part of a larger series of patches that is working on resolving some old driver core design mistakes. It will build and apply cleanly on top of 6.3-rc2 on its own, but I'd prefer if I could take it through my driver-core tree so that the driver core changes can be taken through there for 6.4-rc1. arch/x86/kernel/cpu/microcode/core.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/arch/x86/kernel/cpu/microcode/core.c b/arch/x86/kernel/cpu/microcode/core.c index 7a329e561354..3afcf3de0dd4 100644 --- a/arch/x86/kernel/cpu/microcode/core.c +++ b/arch/x86/kernel/cpu/microcode/core.c @@ -632,6 +632,7 @@ static const struct attribute_group cpu_root_microcode_group = { static int __init microcode_init(void) { + struct device *dev_root; struct cpuinfo_x86 *c = &boot_cpu_data; int error; @@ -652,10 +653,14 @@ static int __init microcode_init(void) if (IS_ERR(microcode_pdev)) return PTR_ERR(microcode_pdev); - error = sysfs_create_group(&cpu_subsys.dev_root->kobj, &cpu_root_microcode_group); - if (error) { - pr_err("Error creating microcode group!\n"); - goto out_pdev; + dev_root = bus_get_dev_root(&cpu_subsys); + if (dev_root) { + error = sysfs_create_group(&dev_root->kobj, &cpu_root_microcode_group); + put_device(dev_root); + if (error) { + pr_err("Error creating microcode group!\n"); + goto out_pdev; + } } /* Do per-CPU setup */ From patchwork Mon Mar 13 18:28:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 69030 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1347301wrd; Mon, 13 Mar 2023 11:47:37 -0700 (PDT) X-Google-Smtp-Source: AK7set9s3/8zNlI5b34ZE0uwptLKuVBimVqZ64cicKHsno+AN02nCTHIc31xGNxQb4ZrxSThpfhI X-Received: by 2002:a17:902:d4cc:b0:19b:dbf7:f9ca with SMTP id o12-20020a170902d4cc00b0019bdbf7f9camr44738932plg.0.1678733257687; Mon, 13 Mar 2023 11:47:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678733257; cv=none; d=google.com; s=arc-20160816; b=G8UFHf0DF1aeJXKl7FWkvdAgOQRUKOXueOOrxqjwV6C0iwQudAS3o0mrAtzv0vxIys 2XbvgIP5tALLnC7GNJjqelisV/NwEbjxbdqZfz1+qheGE4H7JrkDIW7f3N/HrHwI8akI 0alK8hA2NzIWIOkKqJCN979FyftcvnnU2E+qdTgg4o8g9aYO1w8RmiQdC2/c8OnLHWAe Bo7HX4SNADHfyDIzzoflD+gp5W9IZIkyqSWB9nk6W+iHU4ajRW/kKpucV+amA6L2sRnu icDWyepoFw5Obia9o1IhQxrDL2THovhDFvz0LGY+YxfcB9VY7WLFl8v6J50Yz2Vux8SD egXg== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=ADkuL2US46VAy8SSXi59ANb0B1ASkm59oAINZ70BTt4=; b=xqM9ESQpgA6qAB0veX4ga3A4HOQzfaA+lKCOuWEAldSb8aR4Vcchok27CmfxQkTqey zwV0S5nd/mlgo96Sp5USc8z5EyIKL0kaRBH5xCv4l2qLHNO55GKNBFbR1EMyoA9dSQsl 5HexAOGgHzmQ5pmK+AhAbi3qL5DVb1/5hSJ5FvFPf4CBXhGgdnfPLeZVceyCOWtcQg/4 lHvJiolm1TJITUHU81VEtSLxpkxtoG/4WvrXLR9h2O9ahXoD+9+2TBMBvm2Ow4PcGKGE ob+rzoPMsvXoZUUBVGbihXqHaPhgY4x9ct9ihVUHrrK+0gx3QS1VOLFK1PYeyqjMNzeK D8bg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=kVeSIl1u; 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 kb14-20020a170903338e00b0019ab44c2168si338246plb.382.2023.03.13.11.47.24; Mon, 13 Mar 2023 11:47:37 -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=kVeSIl1u; 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 S230430AbjCMSbs (ORCPT + 99 others); Mon, 13 Mar 2023 14:31:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35340 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231159AbjCMSbG (ORCPT ); Mon, 13 Mar 2023 14:31:06 -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 0C18E848CE for ; Mon, 13 Mar 2023 11:30:40 -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 D422DB811DC for ; Mon, 13 Mar 2023 18:30:20 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 449EDC433D2; Mon, 13 Mar 2023 18:30:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1678732219; bh=qGruADsKF1ycq4BqFQi55JPLcBS063gUsHShmvuxofc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kVeSIl1uLbrNAG9OvhZVRP5TAC/Be5RiN4cO8MomaHofxtAPI9dr8zvuVEgaovoEZ J8KuO0BHfW3R5yOmE4r0ClORCCZUrjZtrbTxI1gDnyvZA3F6XNro0GF4mCCBLFxKFf tRbewAXlsh7winx7MpWIV+Phl1DgMYUK7BvK4V5I= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: rafael@kernel.org, Greg Kroah-Hartman , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" Subject: [PATCH 10/36] x86/umwait: move to use bus_get_dev_root() Date: Mon, 13 Mar 2023 19:28:52 +0100 Message-Id: <20230313182918.1312597-10-gregkh@linuxfoundation.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230313182918.1312597-1-gregkh@linuxfoundation.org> References: <20230313182918.1312597-1-gregkh@linuxfoundation.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1598; i=gregkh@linuxfoundation.org; h=from:subject; bh=qGruADsKF1ycq4BqFQi55JPLcBS063gUsHShmvuxofc=; b=owGbwMvMwCRo6H6F97bub03G02pJDCn82eWXbG2fTvW7oGJoJ8wVLXSwcOotXR3RhGzPFtbHb y39yio7YlkYBJkYZMUUWb5s4zm6v+KQopeh7WmYOaxMIEMYuDgFYCJnhRjmpwp27xM4ctFKr2Op HOf9lgcxE6SbGRZcqeG93/Lc/NnvjxkftL705Kx7UfIQAA== X-Developer-Key: i=gregkh@linuxfoundation.org; a=openpgp; fpr=F4B60CC5BF78C2214A313DCB3147D40DDB2DFB29 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, 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?1760279404166857932?= X-GMAIL-MSGID: =?utf-8?q?1760279404166857932?= Direct access to the struct bus_type dev_root pointer is going away soon so replace that with a call to bus_get_dev_root() instead, which is what it is there for. Cc: Thomas Gleixner Cc: Ingo Molnar Cc: Borislav Petkov Cc: Dave Hansen Cc: x86@kernel.org Cc: "H. Peter Anvin" Signed-off-by: Greg Kroah-Hartman --- Note, this is a patch that is a prepatory cleanup as part of a larger series of patches that is working on resolving some old driver core design mistakes. It will build and apply cleanly on top of 6.3-rc2 on its own, but I'd prefer if I could take it through my driver-core tree so that the driver core changes can be taken through there for 6.4-rc1. arch/x86/kernel/cpu/umwait.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/arch/x86/kernel/cpu/umwait.c b/arch/x86/kernel/cpu/umwait.c index ec8064c0ae03..2293efd6ffa6 100644 --- a/arch/x86/kernel/cpu/umwait.c +++ b/arch/x86/kernel/cpu/umwait.c @@ -232,7 +232,11 @@ static int __init umwait_init(void) * Add umwait control interface. Ignore failure, so at least the * default values are set up in case the machine manages to boot. */ - dev = cpu_subsys.dev_root; - return sysfs_create_group(&dev->kobj, &umwait_attr_group); + dev = bus_get_dev_root(&cpu_subsys); + if (dev) { + ret = sysfs_create_group(&dev->kobj, &umwait_attr_group); + put_device(dev); + } + return ret; } device_initcall(umwait_init); From patchwork Mon Mar 13 18:28:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 69020 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1346142wrd; Mon, 13 Mar 2023 11:44:33 -0700 (PDT) X-Google-Smtp-Source: AK7set9kx4zpxPa7wjOEoS2tQAQZfcSYss95qB5xyUGBjWop1ddP9d6/devJjigARUTmE14fnGuD X-Received: by 2002:a05:6a20:a624:b0:cc:92ee:b119 with SMTP id bb36-20020a056a20a62400b000cc92eeb119mr27164463pzb.45.1678733073114; Mon, 13 Mar 2023 11:44:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678733073; cv=none; d=google.com; s=arc-20160816; b=BWR5xoh304L+nUWhhfdTngz+rQqs8WVeO3OeoIDMA+kHj4MdIqYRtEzxFUOpWm8BM0 7NBVBOgEpjed3JzXyhpZj5E76lbk6io9I+Ic1823ReA08MdQfUhBDmbDu2qvzxBt0RKg V9xK+5M6Zf33pmozMcBftqs3jUH+JE8+DyiEx6boP1Kd1wiOQBxZCTlxVT5BR6WLbBL6 epGwoBwi1exmdX1P8ybq2Xq/vE4u5W31fHZ/buMp3nXIc68isyEp9nlyhT0IGfpKjgJ6 Duo/YFLBZ+4WZNyroCTpgnbQKlFkBh22y8pj3GrMPFgWDuuGQeOT2d7cUSwHvt7c5UHL OwXA== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=cOVcdJr73WhpXTIyRkkHLYzXj2k1PMuXFLZyuximZZ8=; b=klsYY+9tVLWU9gHs0tvOa7TZuPhHoYjSaVHZ2gT16qWcFM+wwacbV0U+bacgSE4i3M nAre8vCZtBCo3rySIBC4Z3fqskzswd/EwSlAwPKHGKqXi1dO7rMWorDnjswA/9JDAXkX C5k/VZ1pDirCZSaobuYt0egt5FWIqxTqcYhnITpgu9XEGcS6huHn72Hpo1BmpsKyp9z9 SH5ixhS73L56D6hduHrug4ZHOo3Owp3D5H47IE/aXIgqKXSHJDqDKwSL6yAS+s81ANUG R7gyPuFChQkGfu9LBZmN0qw2CuztLSxGNw/F+J2Zf3wG2D8+G4Sncjw5T0zMQSLyWvv/ KVMw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=cl050Oea; 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 h63-20020a638342000000b00502e3fd615esi162366pge.365.2023.03.13.11.44.20; Mon, 13 Mar 2023 11:44:33 -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=cl050Oea; 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 S229762AbjCMSaz (ORCPT + 99 others); Mon, 13 Mar 2023 14:30:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33710 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231192AbjCMSah (ORCPT ); Mon, 13 Mar 2023 14:30:37 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EF2408389D for ; Mon, 13 Mar 2023 11:30:07 -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 7E5F461465 for ; Mon, 13 Mar 2023 18:29:30 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 69E3BC433D2; Mon, 13 Mar 2023 18:29:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1678732169; bh=6cc07Yo5EzSV1mVa+Tl9FGlm0vk+66ho84vi9KwFE6E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cl050OeaHk/70eeZ/qIp465gBRu3j6q4XWi/RKOII5FNGcK9sW6PVPyiaKVHUA2x9 sqFlBHzI74e2NGa2mEbFPpewoyL2BeOghUGuV0FUvRaj6dnmsIXevM2ry27KVFwlYL B9n2DQn+FaQm2DNAh+jHjIvQZHpk1s+NdcvRTElk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: rafael@kernel.org, Greg Kroah-Hartman , Catalin Marinas , Will Deacon , Mark Brown , James Morse , Kristina Martsenko , Marc Zyngier , Ard Biesheuvel , Vladimir Murzin , Mark Rutland , linux-arm-kernel@lists.infradead.org Subject: [PATCH 11/36] arm64: cpufeature: move to use bus_get_dev_root() Date: Mon, 13 Mar 2023 19:28:53 +0100 Message-Id: <20230313182918.1312597-11-gregkh@linuxfoundation.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230313182918.1312597-1-gregkh@linuxfoundation.org> References: <20230313182918.1312597-1-gregkh@linuxfoundation.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1838; i=gregkh@linuxfoundation.org; h=from:subject; bh=6cc07Yo5EzSV1mVa+Tl9FGlm0vk+66ho84vi9KwFE6E=; b=owGbwMvMwCRo6H6F97bub03G02pJDCn82eVJlo+P744yWWQfVb0uYdL9DexKNz8uL84pzHhdw D/50fRXHbEsDIJMDLJiiixftvEc3V9xSNHL0PY0zBxWJpAhDFycAjCRy+0MCy7cr0iM0fhy7f9c WZ+rF3LNVzUV5TDMr9702NJpvrjn2rzr69Z+sXWe482VCwA= X-Developer-Key: i=gregkh@linuxfoundation.org; a=openpgp; fpr=F4B60CC5BF78C2214A313DCB3147D40DDB2DFB29 X-Spam-Status: No, score=-7.1 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?1760279210752500687?= X-GMAIL-MSGID: =?utf-8?q?1760279210752500687?= Direct access to the struct bus_type dev_root pointer is going away soon so replace that with a call to bus_get_dev_root() instead, which is what it is there for. Cc: Catalin Marinas Cc: Will Deacon Cc: Mark Brown Cc: James Morse Cc: Kristina Martsenko Cc: Marc Zyngier Cc: Ard Biesheuvel Cc: Vladimir Murzin Cc: Mark Rutland Cc: linux-arm-kernel@lists.infradead.org Signed-off-by: Greg Kroah-Hartman --- Note, this is a patch that is a prepatory cleanup as part of a larger series of patches that is working on resolving some old driver core design mistakes. It will build and apply cleanly on top of 6.3-rc2 on its own, but I'd prefer if I could take it through my driver-core tree so that the driver core changes can be taken through there for 6.4-rc1. arch/arm64/kernel/cpufeature.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c index 2e3e55139777..f3bab4bd0917 100644 --- a/arch/arm64/kernel/cpufeature.c +++ b/arch/arm64/kernel/cpufeature.c @@ -1490,10 +1490,18 @@ static const DEVICE_ATTR_RO(aarch32_el0); static int __init aarch32_el0_sysfs_init(void) { + struct device *dev_root; + int ret = 0; + if (!allow_mismatched_32bit_el0) return 0; - return device_create_file(cpu_subsys.dev_root, &dev_attr_aarch32_el0); + dev_root = bus_get_dev_root(&cpu_subsys); + if (dev_root) { + ret = device_create_file(dev_root, &dev_attr_aarch32_el0); + put_device(dev_root); + } + return ret; } device_initcall(aarch32_el0_sysfs_init); From patchwork Mon Mar 13 18:28:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 69040 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1348001wrd; Mon, 13 Mar 2023 11:49:21 -0700 (PDT) X-Google-Smtp-Source: AK7set98K9jtjA3yIZpzqgcX5R9GWDg1Iof3BDvmsE5d1n+MD6eGCzeCCktzWGnnQ4tOscXlpqRd X-Received: by 2002:a17:90b:3846:b0:230:fac8:d7e7 with SMTP id nl6-20020a17090b384600b00230fac8d7e7mr34677505pjb.2.1678733361184; Mon, 13 Mar 2023 11:49:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678733361; cv=none; d=google.com; s=arc-20160816; b=tzSBL0pQqOsAiGgYRzznOMEdVPUBJEWT/W4oxgaZk3RbfVsirnpGmAMD+BNF/R6Nkc WfwfJNA1V0r9DhSqe2PmIcYnDUIWDmaiakw5j0e6E1sKxsQS/RUjlLlzx7ihUNf0rrb9 HPJ7gOwo8mzahG3ejTcy866nP/c7rQILfwETwPsPDmzGoc8F1YUJEy4FKLZfhYddrOmT 2Vytn93ve6CRZPsOZ0OR9M6K8+/+iIRb35wtftGGx9FMPMm9mmpezBMVn6DgskQg4TwU B7StsTBuC1E5NU4k88eKH5XL4nQp81POJ5daIqk5NhzTGu8he5VpD/vVMU8iKonel4xH 0zxg== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=5RFndU86DO2+ij9HZ1Ba4zLuof4yQXYoU8DEZC8wpRk=; b=u88h5H+LQW0cEIfqGJIpujgsOSyzrG2ORbaTa0gM9S+WSguUvBbg9i/DuKdrTOnCPQ fcpyeC+YKHwspZldPRriLzuURgmV8/6fSfhsLSXvIW1mZyJ/tLCCNCFlFvAM+7mkja00 KgBOBveUb/Hi+9ecTH+I3Nwk8vxRR/agmMzLuVvuhhw+cKSuXJ59xSd/AdHIvWIMlP3n ZQX47fpTqty+7nBVRN91QbSKTsGfIdtwMVSwOCDf7ow5ucC8SlyytkSFYPj0r15mE8gy picgFW7NJtWolsxarsbLQS8CreaHFYTsIvRFRwV8Gj147rOI9cNMubrdcIuXoUa4IpQ+ 8WuA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=wjYC2fVs; 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 w9-20020a17090aad4900b00230ca3efcf3si354218pjv.158.2023.03.13.11.49.08; Mon, 13 Mar 2023 11:49:21 -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=wjYC2fVs; 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 S230496AbjCMSaY (ORCPT + 99 others); Mon, 13 Mar 2023 14:30:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33824 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230291AbjCMSaP (ORCPT ); Mon, 13 Mar 2023 14:30:15 -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 0C076D503 for ; Mon, 13 Mar 2023 11:29:49 -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 7E67E61481 for ; Mon, 13 Mar 2023 18:29:33 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8E072C433D2; Mon, 13 Mar 2023 18:29:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1678732172; bh=GZi6aIFaPbxyiWC7UgPxZNnPYWjFOCtg9+DHkUvetJc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=wjYC2fVsQqfI5jh0QjqMMazt/qp4hQhyThWH9kCVBnHP1bow+OIbEgfcq3ow8wBJc zD42zt3S7WDI0mpOSupC59RB09h7Or69T0tSWWIo/DotEOx1J+jhb/MPlgBQ3dhTgB XYzC3m5S//TVyAc0td0hGo9n6uJJDpSOsvNO69OI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: rafael@kernel.org, Greg Kroah-Hartman , Michael Ellerman , Nicholas Piggin , Christophe Leroy , David Hildenbrand , Andrew Morton , linuxppc-dev@lists.ozlabs.org Subject: [PATCH 12/36] powerpc/sysfs: move to use bus_get_dev_root() Date: Mon, 13 Mar 2023 19:28:54 +0100 Message-Id: <20230313182918.1312597-12-gregkh@linuxfoundation.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230313182918.1312597-1-gregkh@linuxfoundation.org> References: <20230313182918.1312597-1-gregkh@linuxfoundation.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2139; i=gregkh@linuxfoundation.org; h=from:subject; bh=GZi6aIFaPbxyiWC7UgPxZNnPYWjFOCtg9+DHkUvetJc=; b=owGbwMvMwCRo6H6F97bub03G02pJDCn82eVP0u/d4E282/La+Y9Ge8br9zerjNax/HkmpCth9 X/H228nO2JZGASZGGTFFFm+bOM5ur/ikKKXoe1pmDmsTCBDGLg4BWAiYRwMC/b3P2fd75zX8XC9 8Nc57tnK866IszHMs1O3/T3dc4P9K86TE1i3JX65nm+wDAA= X-Developer-Key: i=gregkh@linuxfoundation.org; a=openpgp; fpr=F4B60CC5BF78C2214A313DCB3147D40DDB2DFB29 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, 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?1760279513343874919?= X-GMAIL-MSGID: =?utf-8?q?1760279513343874919?= Direct access to the struct bus_type dev_root pointer is going away soon so replace that with a call to bus_get_dev_root() instead, which is what it is there for. Cc: Michael Ellerman Cc: Nicholas Piggin Cc: Christophe Leroy Cc: David Hildenbrand Cc: Andrew Morton Cc: linuxppc-dev@lists.ozlabs.org Signed-off-by: Greg Kroah-Hartman --- Note, this is a patch that is a prepatory cleanup as part of a larger series of patches that is working on resolving some old driver core design mistakes. It will build and apply cleanly on top of 6.3-rc2 on its own, but I'd prefer if I could take it through my driver-core tree so that the driver core changes can be taken through there for 6.4-rc1. arch/powerpc/kernel/sysfs.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/kernel/sysfs.c b/arch/powerpc/kernel/sysfs.c index ef9a61718940..0f39a6b84132 100644 --- a/arch/powerpc/kernel/sysfs.c +++ b/arch/powerpc/kernel/sysfs.c @@ -217,13 +217,18 @@ static DEVICE_ATTR(dscr_default, 0600, static void __init sysfs_create_dscr_default(void) { if (cpu_has_feature(CPU_FTR_DSCR)) { + struct device *dev_root; int cpu; dscr_default = spr_default_dscr; for_each_possible_cpu(cpu) paca_ptrs[cpu]->dscr_default = dscr_default; - device_create_file(cpu_subsys.dev_root, &dev_attr_dscr_default); + dev_root = bus_get_dev_root(&cpu_subsys); + if (dev_root) { + device_create_file(dev_root, &dev_attr_dscr_default); + put_device(dev_root); + } } } #endif /* CONFIG_PPC64 */ @@ -746,7 +751,12 @@ static DEVICE_ATTR(svm, 0444, show_svm, NULL); static void __init create_svm_file(void) { - device_create_file(cpu_subsys.dev_root, &dev_attr_svm); + struct device *dev_root = bus_get_dev_root(&cpu_subsys); + + if (dev_root) { + device_create_file(dev_root, &dev_attr_svm); + put_device(dev_root); + } } #else static void __init create_svm_file(void) From patchwork Mon Mar 13 18:28:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 69041 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1348017wrd; Mon, 13 Mar 2023 11:49:22 -0700 (PDT) X-Google-Smtp-Source: AK7set8hkIp1izbZPiWpMJmcgkFw/WIruCNsep5UjVnkExUfGjFuOC5e336sEAoKbMmZt8iu8jp7 X-Received: by 2002:a05:6a21:6d9f:b0:cd:a334:a531 with SMTP id wl31-20020a056a216d9f00b000cda334a531mr44268627pzb.62.1678733362581; Mon, 13 Mar 2023 11:49:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678733362; cv=none; d=google.com; s=arc-20160816; b=S059k5nzX5lkDJQ+i2K0T1m6JFFMMf+TFeUUFIVsLlrd7YeVhr6vWZfrYUPIVJfcmR MV2odGeH9C+ynSxsr3z0xE0uYWG7T72VJ92YYaSruwqDhD4CRMpuA9iFJ9smjsG6uhhM lpkCtmri2R8BJb8gBSQO2YSMYU8NWdnvYkWZvKsNt8sBUaeyH3BS8AvHeqdbj7hy0ZCm gU+fAIo/KPLbuFrSHqBmuU/fWZem+tZVCgQ1fNjFvwneLJQBKd4V6MKSarIYAMVTEQjf xsMUuC6v6v/OFHwuuNFiCkrCHuOWHv+vNkcH+oxjoBUhnH2OB9bJLHdLYC9YDNKbTqv6 hSdQ== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=cYsI90IFYugCYjdOGQLhxCHK2Lcmp2DcW95bLX4kiNM=; b=Fvbho1Zg2xWDfMDZkd/TH5DQ3lo3e3f/MgKaMAI5OvkFukxEKcO8vptLONqJ9QyGjK ODl00hYvevA2qMrAOePuw/L1xFpNeV+H3ko1F5X+8lhvlHJAL6AufDGjGsXcHogVO2Gb J/4o5+E+j4r/UZxpcuBxl9vS76BYBUEMu8fEIrHA/RCx5/shbQC6WLpKib1HeVTjc8OW xpNo6ibM33BDWgaGdLTALU00Crl8SgDX7hpMulU8XUWcHRW2HX+Q+9Z7EmWgMrhaPPo6 0eEz56JlxMdsiGFrd94N/WTpTqCeolW8+/TLQJI5g11NqDFBTcXxMvuVV/cOgVRttEmk UB2A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=sia3eX1j; 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 70-20020a630449000000b00503355265d2si136889pge.733.2023.03.13.11.49.10; Mon, 13 Mar 2023 11:49:22 -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=sia3eX1j; 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 S231299AbjCMSbJ (ORCPT + 99 others); Mon, 13 Mar 2023 14:31:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34642 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231232AbjCMSaq (ORCPT ); Mon, 13 Mar 2023 14:30:46 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E955283888 for ; Mon, 13 Mar 2023 11:30:16 -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 320026147E for ; Mon, 13 Mar 2023 18:29:36 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 49B4BC433EF; Mon, 13 Mar 2023 18:29:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1678732175; bh=Wkc8ouE8preZxxsKKr+mW1QCYOu2NrmhAiEHH6XrvJ8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sia3eX1jTyd6HFboYPForq+DFhgzXjzHJFJ3CKNpgDiTkRxSnzdvetgUuSrR3REvZ rxPHW7vLDroW30cVO3GV2OI7dbkenunW4WplYf0LDGfmbf5owZQ6HmMIcuI8Tm6pBz 7qjswwHmKBucIQRmxi1knQDyNLlUJx+AHYzUWOZg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: rafael@kernel.org, Greg Kroah-Hartman , Michael Ellerman , Nicholas Piggin , Christophe Leroy , Wolfram Sang , Joel Stanley , Liang He , Julia Lawall , linuxppc-dev@lists.ozlabs.org Subject: [PATCH 13/36] powerpc/powernv: move to use bus_get_dev_root() Date: Mon, 13 Mar 2023 19:28:55 +0100 Message-Id: <20230313182918.1312597-13-gregkh@linuxfoundation.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230313182918.1312597-1-gregkh@linuxfoundation.org> References: <20230313182918.1312597-1-gregkh@linuxfoundation.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2991; i=gregkh@linuxfoundation.org; h=from:subject; bh=Wkc8ouE8preZxxsKKr+mW1QCYOu2NrmhAiEHH6XrvJ8=; b=owGbwMvMwCRo6H6F97bub03G02pJDCn82RWCF9Rn1zBn9X5d7J6Rft93Kr+jnp/wnO+Vhd8UB VeobDLsiGVhEGRikBVTZPmyjefo/opDil6Gtqdh5rAygQxh4OIUgIlsWsgwP9NjR1XwN4/5VgsS ll189TA8doHhEob5OXZX70gzLd+byRTa9f3E230vXay9AQ== X-Developer-Key: i=gregkh@linuxfoundation.org; a=openpgp; fpr=F4B60CC5BF78C2214A313DCB3147D40DDB2DFB29 X-Spam-Status: No, score=-7.1 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?1760279514267073145?= X-GMAIL-MSGID: =?utf-8?q?1760279514267073145?= Direct access to the struct bus_type dev_root pointer is going away soon so replace that with a call to bus_get_dev_root() instead, which is what it is there for. Cc: Michael Ellerman Cc: Nicholas Piggin Cc: Christophe Leroy Cc: Wolfram Sang Cc: Joel Stanley Cc: Liang He Cc: Greg Kroah-Hartman Cc: Julia Lawall Cc: linuxppc-dev@lists.ozlabs.org Signed-off-by: Greg Kroah-Hartman --- Note, this is a patch that is a prepatory cleanup as part of a larger series of patches that is working on resolving some old driver core design mistakes. It will build and apply cleanly on top of 6.3-rc2 on its own, but I'd prefer if I could take it through my driver-core tree so that the driver core changes can be taken through there for 6.4-rc1. arch/powerpc/platforms/powernv/idle.c | 9 +++++++-- arch/powerpc/platforms/powernv/subcore.c | 10 ++++++++-- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/arch/powerpc/platforms/powernv/idle.c b/arch/powerpc/platforms/powernv/idle.c index 841cb7f31f4f..6dfe8d611164 100644 --- a/arch/powerpc/platforms/powernv/idle.c +++ b/arch/powerpc/platforms/powernv/idle.c @@ -1464,14 +1464,19 @@ static int __init pnv_init_idle_states(void) power7_fastsleep_workaround_entry = false; power7_fastsleep_workaround_exit = false; } else { + struct device *dev_root; /* * OPAL_PM_SLEEP_ENABLED_ER1 is set. It indicates that * workaround is needed to use fastsleep. Provide sysfs * control to choose how this workaround has to be * applied. */ - device_create_file(cpu_subsys.dev_root, - &dev_attr_fastsleep_workaround_applyonce); + dev_root = bus_get_dev_root(&cpu_subsys); + if (dev_root) { + device_create_file(dev_root, + &dev_attr_fastsleep_workaround_applyonce); + put_device(dev_root); + } } update_subcore_sibling_mask(); diff --git a/arch/powerpc/platforms/powernv/subcore.c b/arch/powerpc/platforms/powernv/subcore.c index 7e98b00ea2e8..428532a69762 100644 --- a/arch/powerpc/platforms/powernv/subcore.c +++ b/arch/powerpc/platforms/powernv/subcore.c @@ -415,7 +415,9 @@ static DEVICE_ATTR(subcores_per_core, 0644, static int subcore_init(void) { + struct device *dev_root; unsigned pvr_ver; + int rc = 0; pvr_ver = PVR_VER(mfspr(SPRN_PVR)); @@ -435,7 +437,11 @@ static int subcore_init(void) set_subcores_per_core(1); - return device_create_file(cpu_subsys.dev_root, - &dev_attr_subcores_per_core); + dev_root = bus_get_dev_root(&cpu_subsys); + if (dev_root) { + rc = device_create_file(dev_root, &dev_attr_subcores_per_core); + put_device(dev_root); + } + return rc; } machine_device_initcall(powernv, subcore_init); From patchwork Mon Mar 13 18:28:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 69044 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1348314wrd; Mon, 13 Mar 2023 11:50:07 -0700 (PDT) X-Google-Smtp-Source: AK7set/EdLDBqc0b4ua1Kstp6AOBBPaieeTTpoQgbVVMr+S+j7GhnSNAh6+F2CBE4UK7vu+H3PO6 X-Received: by 2002:a17:902:e882:b0:19d:1720:3873 with SMTP id w2-20020a170902e88200b0019d17203873mr45255901plg.57.1678733407327; Mon, 13 Mar 2023 11:50:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678733407; cv=none; d=google.com; s=arc-20160816; b=dO3qOGj/IWUKWpbfAbMkZrfl+C2DbFdeAsgNhxUhPw57J/lc/ghyckdknGy6uhA8jv LJ0vg4Mcvxb4q61RQNkO/NaxGo7UNWQJv914mH/Iwnt0qZNI7RkCVYRjWAYfYz7d+GlD 6vorbMNyNoKhBs8D1U/Eu1+mzavtOmzQTJZhGzVUssYKabGqCecY4tOa+r3TB+Rc6QWv 5KVqWecDgYjLrc5U1sdxjipRK7xVdmx22VTLvUb9EGzvZGfidavgkZnrifXRvhU/NR7o nFtpVTWOnLz2MUw9tDS5tYqmwwq8FLbMsiFTQX0JVY4tPuXhI4MCiAG3DRwRfD1GhFMp O1Fw== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=WZuozcC9nHE4QYAFN+ReJAC0rWSU5VisBEZWXmmvwFU=; b=tgWkEsDAcYOB/exUNU7645tFTucqDgKoFWFXm6aYepIjBA/Ixd3Ng4obvaM0eW/Cnm rHR85nx/nWP3jb9Ct1aeEY0bb1kPlB8x0AneBBirqzJopFbzjIVawOXU8PBoPYqtIfj/ UAj8uEOnp8N6qOGeFPsUbkZVcSWk4cGuYzPy/LTIDPLswFIfE0h/BCm2b2pLDKqCXDd1 mUEx5kGvcTr621iReuxPur144s1nL5OdpVhhU0aHq8WRMqeF5fu+ygVScnmj46juI0LC OKkL8N58HVZNDq3/0dKuH7zUSg038dAAUxnayL4mcw1SoyNDNNaR+StuyWGpBjp8YJNY IabQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=OeCZUVqp; 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 jh6-20020a170903328600b001a05a18d269si410128plb.121.2023.03.13.11.49.54; Mon, 13 Mar 2023 11:50:07 -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=OeCZUVqp; 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 S230400AbjCMSaZ (ORCPT + 99 others); Mon, 13 Mar 2023 14:30:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33928 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230350AbjCMSaT (ORCPT ); Mon, 13 Mar 2023 14:30:19 -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 CF7B022A17 for ; Mon, 13 Mar 2023 11:29:53 -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 82B58B811DC for ; Mon, 13 Mar 2023 18:29:39 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E7583C433D2; Mon, 13 Mar 2023 18:29:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1678732178; bh=Pe0/hNNaMoU0gM+93u/XR+fgNuZd3OVKlbnEDdjzewc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OeCZUVqpSJff9VP+DW9jFNHP3D6bViNOBeHt4CUyGJvvU7OCa6RIm78891LP9xQz7 8yZkNNQ+e1qH+Uem/4Honp0okUzvw/kfI5VcCknWxDwcKw0TcL2lCQsPOgwjQnjOc9 DwUmr8BGMFwrepQxn1GemY6tmvKPe5fMBe6RDIAs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: rafael@kernel.org, Greg Kroah-Hartman , Michael Ellerman , Nicholas Piggin , Christophe Leroy , linuxppc-dev@lists.ozlabs.org Subject: [PATCH 14/36] powerpc/pseries: move to use bus_get_dev_root() Date: Mon, 13 Mar 2023 19:28:56 +0100 Message-Id: <20230313182918.1312597-14-gregkh@linuxfoundation.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230313182918.1312597-1-gregkh@linuxfoundation.org> References: <20230313182918.1312597-1-gregkh@linuxfoundation.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=3929; i=gregkh@linuxfoundation.org; h=from:subject; bh=Pe0/hNNaMoU0gM+93u/XR+fgNuZd3OVKlbnEDdjzewc=; b=owGbwMvMwCRo6H6F97bub03G02pJDCn82RXZKQEzrFPtAtj+X3h7e5d64drtd1yuCEeKHLii9 8/9zIeCjhgWBkEmBlkxRZYv23iO7q84pOhlaHsaZg4rE8gQBi5OAZhIUDvDfJctHGsOFU1n5xUW kdguExvkeDYkiGF6TL621vL83jeZU8IYMq78nJtmyQoA X-Developer-Key: i=gregkh@linuxfoundation.org; a=openpgp; fpr=F4B60CC5BF78C2214A313DCB3147D40DDB2DFB29 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, 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?1760279561649329733?= X-GMAIL-MSGID: =?utf-8?q?1760279561649329733?= Direct access to the struct bus_type dev_root pointer is going away soon so replace that with a call to bus_get_dev_root() instead, which is what it is there for. Cc: Michael Ellerman Cc: Nicholas Piggin Cc: Christophe Leroy Cc: Greg Kroah-Hartman Cc: linuxppc-dev@lists.ozlabs.org Signed-off-by: Greg Kroah-Hartman Acked-by: Michael Ellerman (powerpc) --- Note, this is a patch that is a prepatory cleanup as part of a larger series of patches that is working on resolving some old driver core design mistakes. It will build and apply cleanly on top of 6.3-rc2 on its own, but I'd prefer if I could take it through my driver-core tree so that the driver core changes can be taken through there for 6.4-rc1. .../platforms/pseries/pseries_energy.c | 28 +++++++++++-------- arch/powerpc/platforms/pseries/suspend.c | 10 +++++-- 2 files changed, 25 insertions(+), 13 deletions(-) diff --git a/arch/powerpc/platforms/pseries/pseries_energy.c b/arch/powerpc/platforms/pseries/pseries_energy.c index 09e98d301db0..2c661b798235 100644 --- a/arch/powerpc/platforms/pseries/pseries_energy.c +++ b/arch/powerpc/platforms/pseries/pseries_energy.c @@ -300,20 +300,22 @@ static struct device_attribute attr_percpu_deactivate_hint = static int __init pseries_energy_init(void) { int cpu, err; - struct device *cpu_dev; + struct device *cpu_dev, *dev_root; if (!firmware_has_feature(FW_FEATURE_BEST_ENERGY)) return 0; /* H_BEST_ENERGY hcall not supported */ /* Create the sysfs files */ - err = device_create_file(cpu_subsys.dev_root, - &attr_cpu_activate_hint_list); - if (!err) - err = device_create_file(cpu_subsys.dev_root, - &attr_cpu_deactivate_hint_list); + dev_root = bus_get_dev_root(&cpu_subsys); + if (dev_root) { + err = device_create_file(dev_root, &attr_cpu_activate_hint_list); + if (!err) + err = device_create_file(dev_root, &attr_cpu_deactivate_hint_list); + put_device(dev_root); + if (err) + return err; + } - if (err) - return err; for_each_possible_cpu(cpu) { cpu_dev = get_cpu_device(cpu); err = device_create_file(cpu_dev, @@ -337,14 +339,18 @@ static int __init pseries_energy_init(void) static void __exit pseries_energy_cleanup(void) { int cpu; - struct device *cpu_dev; + struct device *cpu_dev, *dev_root; if (!sysfs_entries) return; /* Remove the sysfs files */ - device_remove_file(cpu_subsys.dev_root, &attr_cpu_activate_hint_list); - device_remove_file(cpu_subsys.dev_root, &attr_cpu_deactivate_hint_list); + dev_root = bus_get_dev_root(&cpu_subsys); + if (dev_root) { + device_remove_file(dev_root, &attr_cpu_activate_hint_list); + device_remove_file(dev_root, &attr_cpu_deactivate_hint_list); + put_device(dev_root); + } for_each_possible_cpu(cpu) { cpu_dev = get_cpu_device(cpu); diff --git a/arch/powerpc/platforms/pseries/suspend.c b/arch/powerpc/platforms/pseries/suspend.c index 1b902cbf85c5..5c43435472cc 100644 --- a/arch/powerpc/platforms/pseries/suspend.c +++ b/arch/powerpc/platforms/pseries/suspend.c @@ -143,6 +143,7 @@ static const struct platform_suspend_ops pseries_suspend_ops = { **/ static int pseries_suspend_sysfs_register(struct device *dev) { + struct device *dev_root; int rc; if ((rc = subsys_system_register(&suspend_subsys, NULL))) @@ -151,8 +152,13 @@ static int pseries_suspend_sysfs_register(struct device *dev) dev->id = 0; dev->bus = &suspend_subsys; - if ((rc = device_create_file(suspend_subsys.dev_root, &dev_attr_hibernate))) - goto subsys_unregister; + dev_root = bus_get_dev_root(&suspend_subsys); + if (dev_root) { + rc = device_create_file(dev_root, &dev_attr_hibernate); + put_device(dev_root); + if (rc) + goto subsys_unregister; + } return 0; From patchwork Mon Mar 13 18:28:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 69039 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1347996wrd; Mon, 13 Mar 2023 11:49:20 -0700 (PDT) X-Google-Smtp-Source: AK7set9HPnPN1/+V/OUwhbm+bAQ0Fh4yUojCzrO/hdTwSOZdnXaPdpIDWQK2yYx77HQKirvL2cX7 X-Received: by 2002:a17:902:7c8d:b0:19e:7001:4763 with SMTP id y13-20020a1709027c8d00b0019e70014763mr30192639pll.43.1678733360432; Mon, 13 Mar 2023 11:49:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678733360; cv=none; d=google.com; s=arc-20160816; b=E7uxwdech5nptJ9/MDm45/qE1fQ52YkbVTfoq20JDJPoslwz/3qKQXl8zSIM43KEz+ aBnhgfHIxLpBrRYzfdcswJ+t6hwFXCWrxdVmnuAgmVtOzcrsDHFGqcOK261oM9WZinBF E26os9CDvBFsYTOEapG9eIr9zVwLkjG+ish6QN641IxBt97ebI6s7GwgeK8xl7xZQxlv VR7YSbxOIQKJwIXZSacB76PSQl4I6CKtEZzriE3i7gD+9Kc7LQHSEH9jYsqtOjdPcoLe W5zr9wqspjGN+GLMdgTIbjaxldVSGOXr/NJTuLGDTmK2ZtEqnoTkNGYYM3ktnzeCYblG AkWw== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=b/Q5PuMDGi05hMgC6s3IGol4svra2ExOgSM2LDzWCS0=; b=yIB+qXl33gYZH8qmYm7rvrgykhGE4aj/LcGEjaFc8yWLXCwgsDqAfVpGhju8gSQXmj 2E92737pXVU/wrBB4KNctjJXKfFPgkS6MnHWpz72Xjdl6uJhFF8BI0i2gHzvkHHSExYm gk2weTzXlUylSJwP8I9X865OPUTM6CKYY0K9O8HkHQcZlW3epLd81KB+Wev0O8MKdGGn jw0SMkygQdWQOVIOEOJJojg71JB/xNWn9zaH5QtJi59X/PQANMf0o7fV9j8y0jTLnzdn b5TcC33PTuGoF8ja6os3B7gSonL2Bm8qSck8roLXANRV1UM+dWjbBv8bKy2lLSfPfo8W Viyw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=0EqNGbMl; 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 jx8-20020a170903138800b001960ccac224si381460plb.2.2023.03.13.11.49.07; Mon, 13 Mar 2023 11:49:20 -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=0EqNGbMl; 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 S230516AbjCMSa3 (ORCPT + 99 others); Mon, 13 Mar 2023 14:30:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33684 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230194AbjCMSaV (ORCPT ); Mon, 13 Mar 2023 14:30:21 -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 56D0C23C6B for ; Mon, 13 Mar 2023 11:29: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 ams.source.kernel.org (Postfix) with ESMTPS id 53CDCB811E1 for ; Mon, 13 Mar 2023 18:29:42 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A8753C433EF; Mon, 13 Mar 2023 18:29:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1678732181; bh=KGCzZ+imnvEdkljNiLcYF+bxrlXNtuGGw3dcz4zdHvo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0EqNGbMlKRwDuQj2dv0OxR31F1eYi9XirJZNBzLWeQT0SJ0Tyj0MKz5pKs+mZRJL6 7PzwqYLKmtqYNSlx7l7k9SAXBmifeT86dP89Uc4zHFLEFEmYy7uqMCbm7BRtuBkXxk DJVr/GVlGmC5Yf0GFy2QmfbwsvE9ZrJXOT4tlcHM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: rafael@kernel.org, Greg Kroah-Hartman , Michael Ellerman , Nicholas Piggin , Christophe Leroy , linuxppc-dev@lists.ozlabs.org Subject: [PATCH 15/36] powerpc/fsl: move to use bus_get_dev_root() Date: Mon, 13 Mar 2023 19:28:57 +0100 Message-Id: <20230313182918.1312597-15-gregkh@linuxfoundation.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230313182918.1312597-1-gregkh@linuxfoundation.org> References: <20230313182918.1312597-1-gregkh@linuxfoundation.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2249; i=gregkh@linuxfoundation.org; h=from:subject; bh=KGCzZ+imnvEdkljNiLcYF+bxrlXNtuGGw3dcz4zdHvo=; b=owGbwMvMwCRo6H6F97bub03G02pJDCn82RXRPonuPMsPTv2Q7DfVuXbJ92m3+Qucvn7XsV38a 9bU45e8OmJZGASZGGTFFFm+bOM5ur/ikKKXoe1pmDmsTCBDGLg4BWAi9Z8ZZrO+cE3qCChKUzi2 /fKlb7ckbGazRjLMM3HMyHx1alexjd3s80oJZTt7JW8xAwA= X-Developer-Key: i=gregkh@linuxfoundation.org; a=openpgp; fpr=F4B60CC5BF78C2214A313DCB3147D40DDB2DFB29 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, 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?1760279511926743461?= X-GMAIL-MSGID: =?utf-8?q?1760279511926743461?= Direct access to the struct bus_type dev_root pointer is going away soon so replace that with a call to bus_get_dev_root() instead, which is what it is there for. Cc: Michael Ellerman Cc: Nicholas Piggin Cc: Christophe Leroy Cc: Greg Kroah-Hartman Cc: linuxppc-dev@lists.ozlabs.org Signed-off-by: Greg Kroah-Hartman --- Note, this is a patch that is a prepatory cleanup as part of a larger series of patches that is working on resolving some old driver core design mistakes. It will build and apply cleanly on top of 6.3-rc2 on its own, but I'd prefer if I could take it through my driver-core tree so that the driver core changes can be taken through there for 6.4-rc1. arch/powerpc/sysdev/fsl_mpic_timer_wakeup.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/arch/powerpc/sysdev/fsl_mpic_timer_wakeup.c b/arch/powerpc/sysdev/fsl_mpic_timer_wakeup.c index c2baa283e624..147b5d8bb904 100644 --- a/arch/powerpc/sysdev/fsl_mpic_timer_wakeup.c +++ b/arch/powerpc/sysdev/fsl_mpic_timer_wakeup.c @@ -116,6 +116,7 @@ static struct device_attribute mpic_attributes = __ATTR(timer_wakeup, 0644, static int __init fsl_wakeup_sys_init(void) { + struct device *dev_root; int ret; fsl_wakeup = kzalloc(sizeof(struct fsl_mpic_timer_wakeup), GFP_KERNEL); @@ -124,16 +125,26 @@ static int __init fsl_wakeup_sys_init(void) INIT_WORK(&fsl_wakeup->free_work, fsl_free_resource); - ret = device_create_file(mpic_subsys.dev_root, &mpic_attributes); - if (ret) - kfree(fsl_wakeup); + dev_root = bus_get_dev_root(&mpic_subsys); + if (dev_root) { + ret = device_create_file(dev_root, &mpic_attributes); + put_device(dev_root); + if (ret) + kfree(fsl_wakeup); + } return ret; } static void __exit fsl_wakeup_sys_exit(void) { - device_remove_file(mpic_subsys.dev_root, &mpic_attributes); + struct device *dev_root; + + dev_root = bus_get_dev_root(&mpic_subsys); + if (dev_root) { + device_remove_file(dev_root, &mpic_attributes); + put_device(dev_root); + } mutex_lock(&sysfs_lock); From patchwork Mon Mar 13 18:28:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 69035 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1347671wrd; Mon, 13 Mar 2023 11:48:32 -0700 (PDT) X-Google-Smtp-Source: AK7set90SPfPxOK2Im1ZiYG37FeKXmkgShd2pyXm/mH65B2GFpYfk1eMtlGePbqlL6L3VawLCeUp X-Received: by 2002:a17:902:9b84:b0:19e:7d66:ff29 with SMTP id y4-20020a1709029b8400b0019e7d66ff29mr29057132plp.61.1678733311831; Mon, 13 Mar 2023 11:48:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678733311; cv=none; d=google.com; s=arc-20160816; b=F2RoHq/oZVEeH85RuZSqBSBBo++wvzeMlcRGX1lG6Y1XRXSuoLcwAsOdm2Kc83yB/C LKeVjGstj72eg8pUcb/N1QgdDDNxahmcOotBxY/xhk8qGBZ869MqFUrjkv9B7WxpuqCj hhIApu4coqGARD0ul8b6OxWJbTDuFsOtBfhUxPzHOq1c9FQXrdUIYcCJo02E35xpIr62 OgKisfEcntWYV1CboI8x7lCHl5NpeYEbOhRTZS+puF1XL+V0cBE4HMPzk+DedJLKj/OF e3/3GgLQo2Uxw77gxav/vH+2SVI6Y199evwn7OU+YxT1/TZdlka5UVdm9fqskfouMFy2 FTrA== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=eqqa7CdhSt8kWgqKihgYkoUPGNduzOlWfhnIbXYHG20=; b=A5uKsSK4iuPTmPPdxBUN5b2sQ2WFkNzAg2mE87WyeVGoWfjWzS+a25g807wvZ6Tco1 k+10xAMqpP0fwpXXZLpu3A62WqCXytbMoj7tf0UvtQwOZrJod+5iUjtoJ/I4LjjNs7Tv 035zClD4YC5V/JcZXCq/uxOlYH8Cn9LjJEloAgkz17Zz9isDr1eZj1TZ0tRrROtF3YaP DRz6qC76km4qV2TLC6s9JiIuJHNkmpu49ZzSplc9trin1UWTmkEdFWvdxsUU5hbCLUpB 9IP2tSURDVbSEgudmKuqWStrulkO1gnTe15DEMIWxKYh0ZpANhFG+aFSQxI44Ht2re0H hD/g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=A5pZkIFW; 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 ke13-20020a170903340d00b0019aa6d30d64si362083plb.183.2023.03.13.11.48.19; Mon, 13 Mar 2023 11:48:31 -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=A5pZkIFW; 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 S231351AbjCMSbh (ORCPT + 99 others); Mon, 13 Mar 2023 14:31:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33556 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230493AbjCMSa6 (ORCPT ); Mon, 13 Mar 2023 14:30:58 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DA68F84809; Mon, 13 Mar 2023 11:30: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 E0306B811DD; Mon, 13 Mar 2023 18:29:44 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 56053C4339B; Mon, 13 Mar 2023 18:29:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1678732183; bh=eoKf67z0RJnZv79uQSS4O970nfxW9TSz1wAks4pBByU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=A5pZkIFW5L4V/98zs6OBmVYuIlG1i6es/nQYVUrj0P/iA0qiRIoGKniahO790i2C0 ibG0+FXU9GeKK7FMeiwpsIyz7AVl9Rx5PuKYhWUYrQWYNveTcvvQhoAsfJeQgiwh2w PsBFyUCjVYJ7VplsjWB6FSh+rFDQ4nPoZW+6pPmk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: rafael@kernel.org, Greg Kroah-Hartman , Yoshinori Sato , Rich Felker , linux-sh@vger.kernel.org Subject: [PATCH 16/36] sh: dma-sysfs: move to use bus_get_dev_root() Date: Mon, 13 Mar 2023 19:28:58 +0100 Message-Id: <20230313182918.1312597-16-gregkh@linuxfoundation.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230313182918.1312597-1-gregkh@linuxfoundation.org> References: <20230313182918.1312597-1-gregkh@linuxfoundation.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1572; i=gregkh@linuxfoundation.org; h=from:subject; bh=eoKf67z0RJnZv79uQSS4O970nfxW9TSz1wAks4pBByU=; b=owGbwMvMwCRo6H6F97bub03G02pJDCn82RUr5qbG39X19HhySf2YgPJ/t03OPxNClzwy1S/Xa WhO6kvriGVhEGRikBVTZPmyjefo/opDil6Gtqdh5rAygQxh4OIUgIn8zmOYZx1QlT3lkf7i13dq n6S0JTTeSZ+oxTA/OMiUfd234PQVsRfPuGhWvrl8otkTAA== X-Developer-Key: i=gregkh@linuxfoundation.org; a=openpgp; fpr=F4B60CC5BF78C2214A313DCB3147D40DDB2DFB29 X-Spam-Status: No, score=-7.1 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?1760279461030892811?= X-GMAIL-MSGID: =?utf-8?q?1760279461030892811?= Direct access to the struct bus_type dev_root pointer is going away soon so replace that with a call to bus_get_dev_root() instead, which is what it is there for. Cc: Yoshinori Sato Cc: Rich Felker Cc: linux-sh@vger.kernel.org Signed-off-by: Greg Kroah-Hartman Acked-by: John Paul Adrian Glaubitz --- Note, this is a patch that is a prepatory cleanup as part of a larger series of patches that is working on resolving some old driver core design mistakes. It will build and apply cleanly on top of 6.3-rc2 on its own, but I'd prefer if I could take it through my driver-core tree so that the driver core changes can be taken through there for 6.4-rc1. arch/sh/drivers/dma/dma-sysfs.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/arch/sh/drivers/dma/dma-sysfs.c b/arch/sh/drivers/dma/dma-sysfs.c index 8ef318150f84..431bc18f0a41 100644 --- a/arch/sh/drivers/dma/dma-sysfs.c +++ b/arch/sh/drivers/dma/dma-sysfs.c @@ -45,13 +45,19 @@ static DEVICE_ATTR(devices, S_IRUGO, dma_show_devices, NULL); static int __init dma_subsys_init(void) { + struct device *dev_root; int ret; ret = subsys_system_register(&dma_subsys, NULL); if (unlikely(ret)) return ret; - return device_create_file(dma_subsys.dev_root, &dev_attr_devices); + dev_root = bus_get_dev_root(&dma_subsys); + if (dev_root) { + ret = device_create_file(dev_root, &dev_attr_devices); + put_device(dev_root); + } + return ret; } postcore_initcall(dma_subsys_init); From patchwork Mon Mar 13 18:28:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 69037 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1347902wrd; Mon, 13 Mar 2023 11:49:09 -0700 (PDT) X-Google-Smtp-Source: AK7set+TCn5uWbTcVVfinYhFHaOFvXNMKXdqc878sH/0piv3SKxJMGsWN0oneEivrcoLVEsC+YYE X-Received: by 2002:a17:903:247:b0:19e:8076:9bd2 with SMTP id j7-20020a170903024700b0019e80769bd2mr40880918plh.17.1678733349198; Mon, 13 Mar 2023 11:49:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678733349; cv=none; d=google.com; s=arc-20160816; b=ZAS7qOPUEdE8XeYjpjBZjMYvX4PZz3j+nglaZj/Gy0KrrQAGljri90H/b4xL4+Tpic G2e1pS9EwsqET3eqFUWNgrhT7Dmn0DFDAaAO3Qf0lwUJqnWuSVFQxOvYvUzsVUhiBstQ alDXFnPFM88wNMKYwvtQm4KNC5QqV3uGq3xJkCckVjMEKqqVrjG5Ho3lf7QEGKPRCzj7 0GFM62ZUN6xgPpELUbZ8HSt0ZoC90ubzrTLrXx58PKSSJ86FL0Ce3f1myzeCrpUDx1tM fbjQd5UoStIgkBhCdAItvTrYoLNoAA5XteZS56gFBelFSJeF7eOsRZiazbEuU9TQ+GIw c6Xg== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=OBd5Dh5Ia3u0As9x0dT71ysqviyPXVBJCqIVtEzKXRs=; b=0opwBkYPYjg03ypSvzpjOZ3IYJuD8Fnpp7xQLDAkGAp2VvhKGrSrDeF4MdpS9ujW/X LDcX6SXg16BbaLYrdoNiyKuwLx6LrMUVkpX2zqjZ/ByFIVbzyW8VC70dL4CHAPKMdR1/ yj3d5Xgesn+r3MQe4KqIzH4Hn92gCKCtg96ni9QyScC/tjn+cCjM7AJLKHdMGVMbgoWG Bgb+VFuPjIzo4H+tf+AF0Ecm1KSAwLtcfpjQWacyefFC8gI4t/q6R1lbZYwyVrfB8xR+ qr5mvIwVniPbpfDoLKWO/u779ql0/0x6+540WHZm93L6hb7eNiXgL1Tw4pWMd9mqFoUJ VXcw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=NOUprOLh; 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 li11-20020a170903294b00b0019f3bf39426si353501plb.518.2023.03.13.11.48.56; Mon, 13 Mar 2023 11:49:09 -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=NOUprOLh; 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 S231178AbjCMScI (ORCPT + 99 others); Mon, 13 Mar 2023 14:32:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33880 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231338AbjCMSbb (ORCPT ); Mon, 13 Mar 2023 14:31:31 -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 E2A2582A94; Mon, 13 Mar 2023 11:30:53 -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 9CCABB811E3; Mon, 13 Mar 2023 18:29:47 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id EB9ABC433D2; Mon, 13 Mar 2023 18:29:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1678732186; bh=BQ3qJWQ4zg4slNAg8mMque6OMF2Djl4oQD+H69jP9YY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NOUprOLhlkrlwRZlYiu/wusk/ux2b99AOfviPnKSf76GQ+8jEd73QVbTrjw/hspgt 4/VnagP02qN2iTAexDyC3Dfip+bob26aEJ47a2TyvbqJcwJu3DvHpnI3IHsN+7L7T0 nYFQqJV33hPBlZE6QD0wkfj2buWCA9/P06lYmIkA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: rafael@kernel.org, Greg Kroah-Hartman , Yoshinori Sato , Rich Felker , linux-sh@vger.kernel.org Subject: [PATCH 17/36] sh: intc: move to use bus_get_dev_root() Date: Mon, 13 Mar 2023 19:28:59 +0100 Message-Id: <20230313182918.1312597-17-gregkh@linuxfoundation.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230313182918.1312597-1-gregkh@linuxfoundation.org> References: <20230313182918.1312597-1-gregkh@linuxfoundation.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1515; i=gregkh@linuxfoundation.org; h=from:subject; bh=BQ3qJWQ4zg4slNAg8mMque6OMF2Djl4oQD+H69jP9YY=; b=owGbwMvMwCRo6H6F97bub03G02pJDCn82RWiLd1ftjeein5+RdZTqZ4vXOT8mUW3BDf4n/fa5 vauY09iRywLgyATg6yYIsuXbTxH91ccUvQytD0NM4eVCWQIAxenAEzkjDrDgrmXDFfe01psfmur 8OJyrscbWTMyLRgWNN8X4bb9MP25+R2T4CKV2SyczH5XAA== X-Developer-Key: i=gregkh@linuxfoundation.org; a=openpgp; fpr=F4B60CC5BF78C2214A313DCB3147D40DDB2DFB29 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, 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?1760279500478885787?= X-GMAIL-MSGID: =?utf-8?q?1760279500478885787?= Direct access to the struct bus_type dev_root pointer is going away soon so replace that with a call to bus_get_dev_root() instead, which is what it is there for. Cc: Yoshinori Sato Cc: Rich Felker Cc: linux-sh@vger.kernel.org Signed-off-by: Greg Kroah-Hartman Acked-by: John Paul Adrian Glaubitz --- Note, this is a patch that is a prepatory cleanup as part of a larger series of patches that is working on resolving some old driver core design mistakes. It will build and apply cleanly on top of 6.3-rc2 on its own, but I'd prefer if I could take it through my driver-core tree so that the driver core changes can be taken through there for 6.4-rc1. drivers/sh/intc/userimask.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/drivers/sh/intc/userimask.c b/drivers/sh/intc/userimask.c index f9f043a3d90a..abe9091827cd 100644 --- a/drivers/sh/intc/userimask.c +++ b/drivers/sh/intc/userimask.c @@ -61,10 +61,18 @@ static DEVICE_ATTR(userimask, S_IRUSR | S_IWUSR, static int __init userimask_sysdev_init(void) { + struct device *dev_root; + int ret = 0; + if (unlikely(!uimask)) return -ENXIO; - return device_create_file(intc_subsys.dev_root, &dev_attr_userimask); + dev_root = bus_get_dev_root(&intc_subsys); + if (dev_root) { + ret = device_create_file(dev_root, &dev_attr_userimask); + put_device(dev_root); + } + return ret; } late_initcall(userimask_sysdev_init); From patchwork Mon Mar 13 18:29:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 69032 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1347366wrd; Mon, 13 Mar 2023 11:47:49 -0700 (PDT) X-Google-Smtp-Source: AK7set+Okac4HoeTRyz5XpQnQrocg6shZ/9t2LBbaUVwnV+KnPs6L+otH1UjrSdl9RhEw7+tv8qS X-Received: by 2002:a05:6a20:431a:b0:cb:77ef:b502 with SMTP id h26-20020a056a20431a00b000cb77efb502mr42012639pzk.5.1678733269286; Mon, 13 Mar 2023 11:47:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678733269; cv=none; d=google.com; s=arc-20160816; b=Ipgc1uzbxUDXFkOvbN2QYA1/7lMUm14+bXR1sW+ss1FgjF6A3TOq5LIgHLE9Mis8r8 SnnxteOHyRyTUfYto5IpbWHYyCfYwHQmxhel93tdZDdBqwy/76/NUWLG3Se8VxUHlJZI ypAfT6p/ch54tTZrCXYuTfCM7OHtX8AfTiUVTDq9yzSsZYBlR8eRrAtIgtFjMH6XCiwo H+4BcqU4fQN4la4q5szge+DCZM2dgj4o1ySR6Kb6+aMD0oCy4gljUSr6UnsTEbFwNSxt TaS6HAjenG6yPmW17BhVAf7xGmqO1oCVIcADacZdCq02pCtAowzbIZ8FUJiVs/g2Aqjf atXg== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=x62l3y1u876TrzrrQTyNIxsgr37vAKrQ5XF5YqkyT0k=; b=M8FkxHyai3uynkZWE+6d/KuHaJMUMWj/oB87jjXj1jXpv6LaE/GcWpPFZl/1JE9OXD EffSVnROsVDO9k61RbGCwqCRGODPCNZgORo3UMsZIVD4CNG8xgV9d9CeeKwI6bgrIBjF VA6zTC8U14CDMw5vNTraQkjB01y/4NnwGRDydp1qD/mYqk25KbYiKUku9TPejzRXH5c4 Oz9umjosWI57IPtHJxTM6Ist9agBuimvxozBrHfg2OqRmD5e3ttEaoQwdvmlDOlW+9yV tK93q7iGG3yhpG7tfeGzYhSLJc5em1ov3OlFB+OTVl/oR+zVngOXQUQHlc4xQFIRFpKn EBvQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Mpqn37CO; 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 v23-20020a634817000000b004ff73120afbsi174446pga.103.2023.03.13.11.47.35; Mon, 13 Mar 2023 11:47:49 -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=Mpqn37CO; 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 S231292AbjCMSbG (ORCPT + 99 others); Mon, 13 Mar 2023 14:31:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33880 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230484AbjCMSap (ORCPT ); Mon, 13 Mar 2023 14:30:45 -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 E393082AA5; Mon, 13 Mar 2023 11:30:12 -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 297DDB811E6; Mon, 13 Mar 2023 18:29:50 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 83239C433D2; Mon, 13 Mar 2023 18:29:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1678732188; bh=1DImE4SDw/1U8fDi71hM95w/aAv4T4ec0I8H7KQ+MbI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Mpqn37CO3YnID2JlgyqjnunDr7UPdRDoBHmebeu4XLs9TCKocPpNK3ykSj1/C27Bk O+C4nYshpQQlU4bsLzariiO9LboIVoXxQdCb/cSK4HO3ip751vaOz5yBy2pINfpLwH UttPAgR7r2mLoyW/dIQz4CNSV3GCkS8RNCngtI7w= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: rafael@kernel.org, Greg Kroah-Hartman , Heiko Carstens , Vasily Gorbik , Alexander Gordeev , Christian Borntraeger , Sven Schnelle , linux-s390@vger.kernel.org Subject: [PATCH 18/36] s390/topology: move to use bus_get_dev_root() Date: Mon, 13 Mar 2023 19:29:00 +0100 Message-Id: <20230313182918.1312597-18-gregkh@linuxfoundation.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230313182918.1312597-1-gregkh@linuxfoundation.org> References: <20230313182918.1312597-1-gregkh@linuxfoundation.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1819; i=gregkh@linuxfoundation.org; h=from:subject; bh=1DImE4SDw/1U8fDi71hM95w/aAv4T4ec0I8H7KQ+MbI=; b=owGbwMvMwCRo6H6F97bub03G02pJDCn82ZVMSdq3W9W5kyctXRij3/9064LDm+Qf//qiu4nNK Eef3/tyRywLgyATg6yYIsuXbTxH91ccUvQytD0NM4eVCWQIAxenAFxkJ8P8mKg/F1xqY269Wzut XCDGZoPWHKvXDPMsk9e97pmdVD/589pFKrvSdzjMOLwEAA== X-Developer-Key: i=gregkh@linuxfoundation.org; a=openpgp; fpr=F4B60CC5BF78C2214A313DCB3147D40DDB2DFB29 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, 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?1760279416390982918?= X-GMAIL-MSGID: =?utf-8?q?1760279416390982918?= Direct access to the struct bus_type dev_root pointer is going away soon so replace that with a call to bus_get_dev_root() instead, which is what it is there for. Cc: Heiko Carstens Cc: Vasily Gorbik Cc: Alexander Gordeev Cc: Christian Borntraeger Cc: Sven Schnelle Cc: linux-s390@vger.kernel.org Signed-off-by: Greg Kroah-Hartman Acked-by: Heiko Carstens --- Note, this is a patch that is a prepatory cleanup as part of a larger series of patches that is working on resolving some old driver core design mistakes. It will build and apply cleanly on top of 6.3-rc2 on its own, but I'd prefer if I could take it through my driver-core tree so that the driver core changes can be taken through there for 6.4-rc1. arch/s390/kernel/topology.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/arch/s390/kernel/topology.c b/arch/s390/kernel/topology.c index c6eecd4a5302..72af753d1bba 100644 --- a/arch/s390/kernel/topology.c +++ b/arch/s390/kernel/topology.c @@ -649,12 +649,21 @@ static struct ctl_table topology_dir_table[] = { static int __init topology_init(void) { + struct device *dev_root; + int rc = 0; + timer_setup(&topology_timer, topology_timer_fn, TIMER_DEFERRABLE); if (MACHINE_HAS_TOPOLOGY) set_topology_timer(); else topology_update_polarization_simple(); register_sysctl_table(topology_dir_table); - return device_create_file(cpu_subsys.dev_root, &dev_attr_dispatching); + + dev_root = bus_get_dev_root(&cpu_subsys); + if (dev_root) { + rc = device_create_file(dev_root, &dev_attr_dispatching); + put_device(dev_root); + } + return rc; } device_initcall(topology_init); From patchwork Mon Mar 13 18:29:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 69026 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1346835wrd; Mon, 13 Mar 2023 11:46:20 -0700 (PDT) X-Google-Smtp-Source: AK7set+tbiT7mj2KbHrAeOh03kzuiarNYAt/2jRURBRW35/b0hpWxnvOYs7FCh12AUoyTIY+bJtr X-Received: by 2002:a05:6a20:7fa4:b0:ce:47dd:4508 with SMTP id d36-20020a056a207fa400b000ce47dd4508mr12730397pzj.18.1678733180083; Mon, 13 Mar 2023 11:46:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678733180; cv=none; d=google.com; s=arc-20160816; b=BmiRKquwqk2ik7XI3PO5mQV8iAuua9R27qU2EK6L3124v7aT2/cZhubRxex061lvGI 5x5AW7UKur15dMmqRip+uzFmuECPz1SbFMzPDqNyuCnvCC+tu6VX//w0dG/WUWHrENhz yy2IX5+w7EM8ibowemuklzOGNApon8aoeCDvicLo7N2UMEhkqU/Zat5bR7rLP5iu17fi tPL0DVQTIqA9pFdVd9LgUe0vM/oasqUe1dVplRNxqdMfvvVxz+ZXucP9yQNOQr8iZEO7 EENt6c9FZ8Kgp4aCGPhmHbjbhskpTlczQi4wWttxEyvaRKXOcqeUWE1W0bNUOHRyoNUh 4lAA== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=FFMu9CI01e0qpCbld89fgF6bck1BJhj/bRh7G9p5TCc=; b=qp30NgqRbAPg0wuYD4PsCkfY5Isyga+HijJFaQ0U3DeJef8I4SI4l4smUmDCd9zcbX oKYHHlgIa5VpikcLARXeSKZo23KmwAYibhPIqSf8+UQWR1hR5yVeB3nsEVX3MeXGGJuA H8L40QYRkXzItGULN9fkUUv5N7nEnFrPGzcu1U95csOKXGfPXFnJAYp4TsvIqUJsayWD iEEIrgK13iUgmrWgyoAoLZWQxs34mC0t4RB+NbnQqhWaNS+J8fKzaQMROq9jPW16sRI3 aJ9EHEkr8ggEmYC27NpHDjrgEV/PTcrYjtGKnoGKlwmiBBiXLjhGaHmx9FBzQGtIbURM D45Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="D/DBZb1+"; 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 o4-20020a635d44000000b004fbaaeac983si183656pgm.331.2023.03.13.11.46.07; Mon, 13 Mar 2023 11:46:20 -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="D/DBZb1+"; 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 S231185AbjCMSah (ORCPT + 99 others); Mon, 13 Mar 2023 14:30:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34012 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230466AbjCMSaV (ORCPT ); Mon, 13 Mar 2023 14:30:21 -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 15F6A521E4; Mon, 13 Mar 2023 11:29:56 -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 1637B6147B; Mon, 13 Mar 2023 18:29:52 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 260A8C433D2; Mon, 13 Mar 2023 18:29:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1678732191; bh=aOxVBk6SUq0AKI+kzrDhXc/isUQsekLwZxFcNjw8eTg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=D/DBZb1+wUdopjALL+oD6cOmayUJHOkCNX2dDoflulo8Ii2EhupwE9KxN9XTUAQ7E VERjBKBU34vsEmveqqsY4sOVHu8V8OJhnggiBf0YTbQIYXw6l/GlDn1tDqeSx0NtWM UdEf5z35pYIU2FcUzqkSj8wbq1gnp1L3/WjKRkXE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: rafael@kernel.org, Greg Kroah-Hartman , Heiko Carstens , Vasily Gorbik , Alexander Gordeev , Christian Borntraeger , Sven Schnelle , Ilya Leoshkevich , linux-s390@vger.kernel.org Subject: [PATCH 19/36] s390/smp: move to use bus_get_dev_root() Date: Mon, 13 Mar 2023 19:29:01 +0100 Message-Id: <20230313182918.1312597-19-gregkh@linuxfoundation.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230313182918.1312597-1-gregkh@linuxfoundation.org> References: <20230313182918.1312597-1-gregkh@linuxfoundation.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1672; i=gregkh@linuxfoundation.org; h=from:subject; bh=aOxVBk6SUq0AKI+kzrDhXc/isUQsekLwZxFcNjw8eTg=; b=owGbwMvMwCRo6H6F97bub03G02pJDCn82ZVst5NlJ+pYXlJZE1H9boH7gh09y/qXyVh+sE8w+ xn96/OZjlgWBkEmBlkxRZYv23iO7q84pOhlaHsaZg4rE8gQBi5OAZiIZxzDgjkP5lspMOzkYa/8 Fel299iOdW9O/GdYcPrdLL0n1Y7rftybJPDsZkcWz+orhQA= X-Developer-Key: i=gregkh@linuxfoundation.org; a=openpgp; fpr=F4B60CC5BF78C2214A313DCB3147D40DDB2DFB29 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, 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?1760279323086533290?= X-GMAIL-MSGID: =?utf-8?q?1760279323086533290?= Direct access to the struct bus_type dev_root pointer is going away soon so replace that with a call to bus_get_dev_root() instead, which is what it is there for. Cc: Heiko Carstens Cc: Vasily Gorbik Cc: Alexander Gordeev Cc: Christian Borntraeger Cc: Sven Schnelle Cc: Ilya Leoshkevich Cc: linux-s390@vger.kernel.org Signed-off-by: Greg Kroah-Hartman Acked-by: Heiko Carstens --- Note, this is a patch that is a prepatory cleanup as part of a larger series of patches that is working on resolving some old driver core design mistakes. It will build and apply cleanly on top of 6.3-rc2 on its own, but I'd prefer if I could take it through my driver-core tree so that the driver core changes can be taken through there for 6.4-rc1. arch/s390/kernel/smp.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/arch/s390/kernel/smp.c b/arch/s390/kernel/smp.c index d4888453bbf8..4df797ab8ca2 100644 --- a/arch/s390/kernel/smp.c +++ b/arch/s390/kernel/smp.c @@ -1227,11 +1227,17 @@ static DEVICE_ATTR_WO(rescan); static int __init s390_smp_init(void) { + struct device *dev_root; int cpu, rc = 0; - rc = device_create_file(cpu_subsys.dev_root, &dev_attr_rescan); - if (rc) - return rc; + dev_root = bus_get_dev_root(&cpu_subsys); + if (dev_root) { + rc = device_create_file(dev_root, &dev_attr_rescan); + put_device(dev_root); + if (rc) + return rc; + } + for_each_present_cpu(cpu) { rc = smp_add_present_cpu(cpu); if (rc) From patchwork Mon Mar 13 18:29:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 69013 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1343672wrd; Mon, 13 Mar 2023 11:38:17 -0700 (PDT) X-Google-Smtp-Source: AK7set+/Vbd7UEJcoc7PSXcvunOs0I165IgibEpo3HIOdwH0qMX/+W9AlMf8dQQLHYFjzzVViIN1 X-Received: by 2002:a17:90a:7bc2:b0:237:8617:b5a4 with SMTP id d2-20020a17090a7bc200b002378617b5a4mr11566342pjl.21.1678732696632; Mon, 13 Mar 2023 11:38:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678732696; cv=none; d=google.com; s=arc-20160816; b=tb8n/O07SKDsdRTpW8phpgj0TeQXANfVKfsQngmsbFeVyDnjFLbqU/Y+FRxtyrwkyT FNnJTdmLEjvonXEtq/+2+z6xdeqf9vNX7cHItmvuRejRt43ANvCfe1aOG2F8w5Qi1LFo hXnDjk9tAul5R+1eroi6dpIWvjaWWfHgRuWMY6rO/jh7H/Sslr7f+y7gQ/o4OXKKmp78 ZPdncgtANLPIMsB1L3lnXSMYqcojOdH3Aecd2u+zvirJ2f+XQ5UINv0SeHrue5d4uwQQ jq6/WK005Q9JZOt36LCKNPDVwzahg9S3Q3aZKIA8pUnkWISOsXlqmPUkEnMBubAB5QGL pbDg== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=PigPepKLrw04T/LwITApPyLQT3rBsmSxHe3k9qMRVoM=; b=bo6xZFJTB+yrEdugRsP6UCoFLiiKss3Ei59LuwEzxn81BvvSPBQmNkuFeSanN7GQyr cZFNnU2fGFg0zma4C/I9QRUwEffe/HtQ3OfyqdkQKBXtTjZeKcOUUC/3S7Id8rbXUitB ALNA1KIMpW0jZ/AXuat9sZ0tr+VCRkcWZm1KGRf6X+sa6scmiBpKOLFhsMSrgpZqfdMd ws6q+ZMdtv/x8AjiUSU8Gr5Y1kjAiVwC86otEpA90WgqSl0OViRTFt76E1Q1xwBY5Z2Y QkykRXl4BYe7esxHAOEbx3koiimgh/xItZRiyqXjhioXpYKJqZD29XGrge/XCh6aOcPR NrUw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=HGioplhr; 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 u10-20020a17090ae00a00b0023409b3983fsi354025pjy.99.2023.03.13.11.38.01; Mon, 13 Mar 2023 11:38:16 -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=HGioplhr; 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 S231218AbjCMSa6 (ORCPT + 99 others); Mon, 13 Mar 2023 14:30:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33826 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231204AbjCMSao (ORCPT ); Mon, 13 Mar 2023 14:30:44 -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 003C683156; Mon, 13 Mar 2023 11:30:08 -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 A62DB61468; Mon, 13 Mar 2023 18:29:54 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id BC821C433D2; Mon, 13 Mar 2023 18:29:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1678732194; bh=t8dfYO0KLvBwnDTabEC6Q8qADtWU+S9Nx/DV5qsE0XE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HGioplhrdEI2WqXg6RyaSAemRoVq2lTQmz+O74akI8S9P9KQkkWd6rr7lyXz9TOWu 93VPXul7gBSXKunekt9nTj5YFJm9jkFMULQsNkcyklppo3VhpDzmKOlM4ECFCWBc/0 EJdkJ0YcrmkEerZiECNBOO1bcKrZigw0DW5ReISg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: rafael@kernel.org, Greg Kroah-Hartman , Huang Rui , Viresh Kumar , linux-pm@vger.kernel.org Subject: [PATCH 20/36] cpufreq: amd-pstate: move to use bus_get_dev_root() Date: Mon, 13 Mar 2023 19:29:02 +0100 Message-Id: <20230313182918.1312597-20-gregkh@linuxfoundation.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230313182918.1312597-1-gregkh@linuxfoundation.org> References: <20230313182918.1312597-1-gregkh@linuxfoundation.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=3145; i=gregkh@linuxfoundation.org; h=from:subject; bh=t8dfYO0KLvBwnDTabEC6Q8qADtWU+S9Nx/DV5qsE0XE=; b=owGbwMvMwCRo6H6F97bub03G02pJDCn82ZXXBZRtTAvFnk1yaP1WWbM0JFjTKdUxcNbZcksJO Qub2vqOWBYGQSYGWTFFli/beI7urzik6GVoexpmDisTyBAGLk4BmMgWYYb5kfuLXv/YzP60ZLu+ eUv93CrDthfdDPMse++sO3xneoxO/u2AP5HT/y86oMkJAA== X-Developer-Key: i=gregkh@linuxfoundation.org; a=openpgp; fpr=F4B60CC5BF78C2214A313DCB3147D40DDB2DFB29 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, 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?1760278816263840647?= X-GMAIL-MSGID: =?utf-8?q?1760278816263840647?= Direct access to the struct bus_type dev_root pointer is going away soon so replace that with a call to bus_get_dev_root() instead, which is what it is there for. In doing so, remove the unneded kobject structure that was only being created to cause a subdirectory for the attributes. The name of the attribute group is the correct way to do this, saving code and complexity as well as allowing the attributes to properly show up to userspace tools (the raw kobject would not allow that.) Cc: Huang Rui Cc: "Rafael J. Wysocki" Cc: Viresh Kumar Cc: linux-pm@vger.kernel.org Signed-off-by: Greg Kroah-Hartman Acked-by: Huang Rui --- Note, this is a patch that is a prepatory cleanup as part of a larger series of patches that is working on resolving some old driver core design mistakes. It will build and apply cleanly on top of 6.3-rc2 on its own, but I'd prefer if I could take it through my driver-core tree so that the driver core changes can be taken through there for 6.4-rc1. drivers/cpufreq/amd-pstate.c | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/drivers/cpufreq/amd-pstate.c b/drivers/cpufreq/amd-pstate.c index 73c7643b2697..b92454c50118 100644 --- a/drivers/cpufreq/amd-pstate.c +++ b/drivers/cpufreq/amd-pstate.c @@ -63,7 +63,6 @@ static struct cpufreq_driver *current_pstate_driver; static struct cpufreq_driver amd_pstate_driver; static struct cpufreq_driver amd_pstate_epp_driver; static int cppc_state = AMD_PSTATE_DISABLE; -struct kobject *amd_pstate_kobj; /* * AMD Energy Preference Performance (EPP) @@ -932,6 +931,7 @@ static struct attribute *pstate_global_attributes[] = { }; static const struct attribute_group amd_pstate_global_attr_group = { + .name = "amd_pstate", .attrs = pstate_global_attributes, }; @@ -1253,6 +1253,7 @@ static struct cpufreq_driver amd_pstate_epp_driver = { static int __init amd_pstate_init(void) { + struct device *dev_root; int ret; if (boot_cpu_data.x86_vendor != X86_VENDOR_AMD) @@ -1299,24 +1300,19 @@ static int __init amd_pstate_init(void) if (ret) pr_err("failed to register with return %d\n", ret); - amd_pstate_kobj = kobject_create_and_add("amd_pstate", &cpu_subsys.dev_root->kobj); - if (!amd_pstate_kobj) { - ret = -EINVAL; - pr_err("global sysfs registration failed.\n"); - goto kobject_free; - } - - ret = sysfs_create_group(amd_pstate_kobj, &amd_pstate_global_attr_group); - if (ret) { - pr_err("sysfs attribute export failed with error %d.\n", ret); - goto global_attr_free; + dev_root = bus_get_dev_root(&cpu_subsys); + if (dev_root) { + ret = sysfs_create_group(&dev_root->kobj, &amd_pstate_global_attr_group); + put_device(dev_root); + if (ret) { + pr_err("sysfs attribute export failed with error %d.\n", ret); + goto global_attr_free; + } } return ret; global_attr_free: - kobject_put(amd_pstate_kobj); -kobject_free: cpufreq_unregister_driver(current_pstate_driver); return ret; } From patchwork Mon Mar 13 18:29:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 69012 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1342749wrd; Mon, 13 Mar 2023 11:36:08 -0700 (PDT) X-Google-Smtp-Source: AK7set8CS1u8PEOrbhWGRYS4U1ge6Ws/GKR72HUftqkZqmBF7IXjzqg+kU95wbOcpROFw6bq/yms X-Received: by 2002:a17:902:6b49:b0:19a:7f4b:3ef6 with SMTP id g9-20020a1709026b4900b0019a7f4b3ef6mr29636228plt.3.1678732567806; Mon, 13 Mar 2023 11:36:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678732567; cv=none; d=google.com; s=arc-20160816; b=pvBrK81dwxUtj9OeZVKgI/5PTxkr2NiJE4NP5b6r+4KR7J7xDyNstQmfeo3asfYQNu 8zMCYYPS88zTYUV6hehddHQfstHFDiBq2vl+J9BNwB0Jyse9L5bFCqz3a5ByCIy1Qkp7 FAOBf0SGbeQfhd8x0/SIl01IPilZ8NYRrZdqkyrEVtKqv1nOopOBuoDgN9LmUNubtHp3 Gyo2gQxZB8T6vqLsyZ+WlCAVia+ZFZTM27A9dHEOR5U99dR+7mTZ5LQHpaVZBRC51kkO cE5ROtzcjIO6TTBqeq1CFo2PaIDieg7jUlQ6PVeoOGr6oNmbvuYp9FKvuyPPH8EmrgzG +jwg== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=UJKjuOGDbrLYTiV56o66S1UkwPSIMpf/FooeUy6u4pc=; b=V6r6eSkxsGMWy1IOhJ3Px+hJMPGmlWxWeTusvaCgNW052mUMFCI/oxtAUXiM3+Hv2c ySHmLivwaJ3eDF5E+6XK06oB4QA2HN/O+b4mTQA+XohjLzXQW2dmntSubebOXi/tQXEx 0kuYlow0wVFWwqchj7qjKozt+1gXiUQqH5RB7XdN6I9eMhf2zKhqQfOPv8NJqV+REU5G 4Iz2gSqY7QALodqtJN8j9PAPPq6DPj3oVnzPO7E7wzayqZ8hLu0NXIAXSFIS0O9Y+r7b hK80obeOZqYm9Q6v1927tdqlHdSqB+hW1n2jfw0SszZiTjVuTnz1pW7cf3COfq4CLCAl SudQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="MLMA0/W4"; 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 kk3-20020a170903070300b0019e665b24e0si399841plb.1.2023.03.13.11.35.52; Mon, 13 Mar 2023 11:36:07 -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="MLMA0/W4"; 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 S229662AbjCMSbU (ORCPT + 99 others); Mon, 13 Mar 2023 14:31:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34238 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230515AbjCMSas (ORCPT ); Mon, 13 Mar 2023 14:30:48 -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 E2A901499A for ; Mon, 13 Mar 2023 11:30:22 -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 78B98B811E7 for ; Mon, 13 Mar 2023 18:30:00 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E690CC433D2; Mon, 13 Mar 2023 18:29:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1678732199; bh=NvUcPCqXclVT0vDCEaH778GVQZ2rqILZ8eRefC/g5TQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MLMA0/W4RIYMRSO1RYJk3EvULfF9X82t6F0IpxQCpIqQu/2t2VdHyACPpsqR/KTg1 rH9wAim3CUuFFGIspkL/zcHN4Z+Bg/Xul2JQRfXjS/DaL54wFjZ8No+Gchk7x4mQNs h3oP3oexGZZzUBUd1yEwNczLF//yo90Wc/2CjaZo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: rafael@kernel.org, Greg Kroah-Hartman , Thomas Gleixner , Marc Zyngier Subject: [PATCH 21/36] irqchip/mbigen: move to use bus_get_dev_root() Date: Mon, 13 Mar 2023 19:29:03 +0100 Message-Id: <20230313182918.1312597-21-gregkh@linuxfoundation.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230313182918.1312597-1-gregkh@linuxfoundation.org> References: <20230313182918.1312597-1-gregkh@linuxfoundation.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1593; i=gregkh@linuxfoundation.org; h=from:subject; bh=NvUcPCqXclVT0vDCEaH778GVQZ2rqILZ8eRefC/g5TQ=; b=owGbwMvMwCRo6H6F97bub03G02pJDCn82ZXX5P+xTk86lSulc/TLbwa3X8tdmtXbS/Nvz1MLN VojlcHfEcvCIMjEICumyPJlG8/R/RWHFL0MbU/DzGFlAhnCwMUpABMxYmNYMG15zvGHYWdeOFS7 iXy4OsPSYt4pLoYFcyQtW4v6TC5ebAl6HaN8KX8d7+o3AA== X-Developer-Key: i=gregkh@linuxfoundation.org; a=openpgp; fpr=F4B60CC5BF78C2214A313DCB3147D40DDB2DFB29 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, 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?1760278681230563360?= X-GMAIL-MSGID: =?utf-8?q?1760278681230563360?= Direct access to the struct bus_type dev_root pointer is going away soon so replace that with a call to bus_get_dev_root() instead, which is what it is there for. Cc: Thomas Gleixner Cc: Marc Zyngier Signed-off-by: Greg Kroah-Hartman --- Note, this is a patch that is a prepatory cleanup as part of a larger series of patches that is working on resolving some old driver core design mistakes. It will build and apply cleanly on top of 6.3-rc2 on its own, but I'd prefer if I could take it through my driver-core tree so that the driver core changes can be taken through there for 6.4-rc1. drivers/irqchip/irq-mbigen.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/drivers/irqchip/irq-mbigen.c b/drivers/irqchip/irq-mbigen.c index f3faf5c99770..30ca1bf7fc8b 100644 --- a/drivers/irqchip/irq-mbigen.c +++ b/drivers/irqchip/irq-mbigen.c @@ -245,11 +245,14 @@ static int mbigen_of_create_domain(struct platform_device *pdev, if (!of_property_read_bool(np, "interrupt-controller")) continue; - parent = platform_bus_type.dev_root; - child = of_platform_device_create(np, NULL, parent); - if (!child) { - of_node_put(np); - return -ENOMEM; + parent = bus_get_dev_root(&platform_bus_type); + if (parent) { + child = of_platform_device_create(np, NULL, parent); + put_device(parent); + if (!child) { + of_node_put(np); + return -ENOMEM; + } } if (of_property_read_u32(child->dev.of_node, "num-pins", From patchwork Mon Mar 13 18:29:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 69059 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1358310wrd; Mon, 13 Mar 2023 12:12:23 -0700 (PDT) X-Google-Smtp-Source: AK7set++l3OAHoCQpoo80kCuoqj7ACC12HX9FKFx8bHNS+g+ei87Logosclq3vMsTq+yzPIVEnpe X-Received: by 2002:a17:90b:4b04:b0:233:f354:e7df with SMTP id lx4-20020a17090b4b0400b00233f354e7dfmr38750685pjb.18.1678734743408; Mon, 13 Mar 2023 12:12:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678734743; cv=none; d=google.com; s=arc-20160816; b=SWpZxqxn0LDOdL3iUuUuhPmkkEuUBgWizOJPa6Cp2yLcl//enJCMeiwGPadYJLtjru ViKd/9DTXyJLyTRP8W1w24WjDf94XtUndd+8Kbiauk/gGN0lfTLvJ3ZwWeVQfXjyMloh NwWE7fu+sucDp0+izN+PEmYygB4qTxXpsFn/Vdxdfuh+mpg+ny+l/iQ8I8h+zlaqcJsD 4B4XqQBsPgi0lRJkaEU/3hw/ngZS2e5ngAMGwd08kqCKxH6pfa2JUaG5tNF3saLb2Fw3 cb4B2nCdkrBfma3c5qUqnAC1O3KgdEtjBetCSxvtgxgPF6JFHn3iqy2pbYWEDPFKnIAH Temg== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=wL/zGr/n9A9oZvIjzx/WkY0c3rXeJuWkmx60CF2GFRw=; b=OZcAGMiIyy5/xJrbs3xZpAglRB8ZgInfOZ4Tg3djxpREZuLRkQ4b4Vjwj29oQV9Ktb PwMGgIUV1a6ToFBLm5Q/CcvgTJ43xo/yJdbji1rSPZaoiJ5DARAGsZ3tvInsUaTy+10J YKznW5sn2bGVC0QP7/RVhGGxeu1RJ7Pu2ZcGKi17zDKlH+QXk6CqeDMhTwnjy1pTslgt NyD/ouzTffauSwC6Um48WLt8EuU9mVqi+EOEac1qGLRordfuoW5U3gNeYveV0cOC62pj N7MJAq0C+17716w7x1WWOHBNIKZs61Z5fmeYDn8mUF7bkzfwny1uhRjFeN63sEmLFTnH sNAg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=T8oFJt9D; 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 d2-20020a17090a110200b0022be3049e52si437533pja.34.2023.03.13.12.12.08; Mon, 13 Mar 2023 12:12:23 -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=T8oFJt9D; 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 S231477AbjCMSdA (ORCPT + 99 others); Mon, 13 Mar 2023 14:33:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33566 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231355AbjCMScW (ORCPT ); Mon, 13 Mar 2023 14:32:22 -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 6A1711CAD1 for ; Mon, 13 Mar 2023 11:31:21 -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 B3512B811EA for ; Mon, 13 Mar 2023 18:31:00 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0FC1FC433EF; Mon, 13 Mar 2023 18:30:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1678732259; bh=hPDqRd7gJAlE6q+8Dn7WGhvvs2+lkO722JN+XrEQSO8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=T8oFJt9DXLI7Dq+P3FUyBUHgoWY75uuwjRvIkZmfF04kJS+nrH0zaBjC1hT3o/u1l 4MF3Z3ERPAVll+4EVU4gwUeSdb+Fr4p417NpIFfbISOG3HgYJeB4dx0m/7KIY66u8H FRd+Ej6+oWFJC9WGNYdLQtWKXAE+FgCT4FjOT0tc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: rafael@kernel.org, Greg Kroah-Hartman Subject: [PATCH 22/36] driver core: bus: move dev_root out of struct bus_type Date: Mon, 13 Mar 2023 19:29:04 +0100 Message-Id: <20230313182918.1312597-22-gregkh@linuxfoundation.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230313182918.1312597-1-gregkh@linuxfoundation.org> References: <20230313182918.1312597-1-gregkh@linuxfoundation.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=4073; i=gregkh@linuxfoundation.org; h=from:subject; bh=hPDqRd7gJAlE6q+8Dn7WGhvvs2+lkO722JN+XrEQSO8=; b=owGbwMvMwCRo6H6F97bub03G02pJDCn82VXZF83MrzAx7Uu9yn/i/MUad/4NXcsaRGZ2/smoO lN7xEm8I5aFQZCJQVZMkeXLNp6j+ysOKXoZ2p6GmcPKBDKEgYtTACZi9oJhwVpGxbyamMO6Oz8a CFsdVVkgN/nzK4b5CYZamqqWTkceV54t+vf8guk897enAQ== X-Developer-Key: i=gregkh@linuxfoundation.org; a=openpgp; fpr=F4B60CC5BF78C2214A313DCB3147D40DDB2DFB29 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, 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?1760280962279251617?= X-GMAIL-MSGID: =?utf-8?q?1760280962279251617?= Now that all accesses of dev_root is through the bus_get_dev_root() call, move the pointer out of struct bus_type and into the private dynamic structure, subsys_private. With this change, there is no modifiable portions of struct bus_type so it can be marked as a constant structure and moved to read-only memory. Cc: "Rafael J. Wysocki" Signed-off-by: Greg Kroah-Hartman --- drivers/base/base.h | 2 ++ drivers/base/bus.c | 28 ++++++++++++++++++++++------ include/linux/device/bus.h | 2 -- 3 files changed, 24 insertions(+), 8 deletions(-) diff --git a/drivers/base/base.h b/drivers/base/base.h index b055eba1ec30..f1034e27e651 100644 --- a/drivers/base/base.h +++ b/drivers/base/base.h @@ -27,6 +27,7 @@ * on this bus. * @bus - pointer back to the struct bus_type that this structure is associated * with. + * @dev_root: Default device to use as the parent. * * @glue_dirs - "glue" directory to put in-between the parent device to * avoid namespace conflicts @@ -49,6 +50,7 @@ struct subsys_private { struct blocking_notifier_head bus_notifier; unsigned int drivers_autoprobe:1; struct bus_type *bus; + struct device *dev_root; struct kset glue_dirs; struct class *class; diff --git a/drivers/base/bus.c b/drivers/base/bus.c index dd4b82d7510f..91a6b6b1fc49 100644 --- a/drivers/base/bus.c +++ b/drivers/base/bus.c @@ -935,8 +935,8 @@ void bus_unregister(const struct bus_type *bus) return; pr_debug("bus: '%s': unregistering\n", bus->name); - if (bus->dev_root) - device_unregister(bus->dev_root); + if (sp->dev_root) + device_unregister(sp->dev_root); bus_kobj = &sp->subsys.kobj; sysfs_remove_groups(bus_kobj, bus->bus_groups); @@ -1198,6 +1198,7 @@ static int subsys_register(struct bus_type *subsys, const struct attribute_group **groups, struct kobject *parent_of_root) { + struct subsys_private *sp; struct device *dev; int err; @@ -1205,6 +1206,12 @@ static int subsys_register(struct bus_type *subsys, if (err < 0) return err; + sp = bus_to_subsys(subsys); + if (!sp) { + err = -EINVAL; + goto err_sp; + } + dev = kzalloc(sizeof(struct device), GFP_KERNEL); if (!dev) { err = -ENOMEM; @@ -1223,7 +1230,8 @@ static int subsys_register(struct bus_type *subsys, if (err < 0) goto err_dev_reg; - subsys->dev_root = dev; + sp->dev_root = dev; + subsys_put(sp); return 0; err_dev_reg: @@ -1232,6 +1240,8 @@ static int subsys_register(struct bus_type *subsys, err_name: kfree(dev); err_dev: + subsys_put(sp); +err_sp: bus_unregister(subsys); return err; } @@ -1349,9 +1359,15 @@ bool bus_is_registered(const struct bus_type *bus) */ struct device *bus_get_dev_root(const struct bus_type *bus) { - if (bus) - return get_device(bus->dev_root); - return NULL; + struct subsys_private *sp = bus_to_subsys(bus); + struct device *dev_root; + + if (!sp) + return NULL; + + dev_root = get_device(sp->dev_root); + subsys_put(sp); + return dev_root; } EXPORT_SYMBOL_GPL(bus_get_dev_root); diff --git a/include/linux/device/bus.h b/include/linux/device/bus.h index 6ce32ef4b8fd..c258e8770285 100644 --- a/include/linux/device/bus.h +++ b/include/linux/device/bus.h @@ -26,7 +26,6 @@ struct fwnode_handle; * * @name: The name of the bus. * @dev_name: Used for subsystems to enumerate devices like ("foo%u", dev->id). - * @dev_root: Default device to use as the parent. * @bus_groups: Default attributes of the bus. * @dev_groups: Default attributes of the devices on the bus. * @drv_groups: Default attributes of the device drivers on the bus. @@ -82,7 +81,6 @@ struct fwnode_handle; struct bus_type { const char *name; const char *dev_name; - struct device *dev_root; const struct attribute_group **bus_groups; const struct attribute_group **dev_groups; const struct attribute_group **drv_groups; From patchwork Mon Mar 13 18:29:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 69019 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1345669wrd; Mon, 13 Mar 2023 11:43:26 -0700 (PDT) X-Google-Smtp-Source: AK7set+EzTWjqt8dm6YcoOfxCrhEB0bfGM+x8B8rfa5X6Vq9QHvvQSZcWEljZ/25IsI1iPZl4axg X-Received: by 2002:a62:1756:0:b0:625:13f3:9409 with SMTP id 83-20020a621756000000b0062513f39409mr2200676pfx.26.1678733006367; Mon, 13 Mar 2023 11:43:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678733006; cv=none; d=google.com; s=arc-20160816; b=jIAH0bZnnt2P//a+vDOkjVjICVBhczHKvF1UwMwoiu4YXyw1SE4HpLSs6cEQFvREfw lp6evC3Rxt7t1QsCPyBdinb3YKdI+EBsLBcOXYEp38GeTUc0cuykwoXz2GN3V2YCUPBZ +PbnLb2hkNKw+bHIG4tKakUcQ0ex67CDn4A8+x5IMjN2/+nFeOBCQP9TBQuLKIFhPtmg 6a9ZVpZiqGi4gaO08QsRfEciuAloPisHuBciTlLECex/bm5PFR4As1Wx4G4Qeg6CIrSY tCVd8yUg9/w/x77GQ+7HDdN0YSIZ2wS+Fa7yTHLOKRCgfa2kFtkbOGghgXTQ76Xl+TCm hh2w== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=AdCF/eSMGGR5HamusKiV4F+5Ot6CHqmHUgM1CP1rgeU=; b=hltsnagm5BsVk41g/MowvyIjULw+uHjAvrDr2lBJi+Ue6arlGkwhFKc/FghzL/RHY6 Qpphuyl6x5xjxbvqdI4AHdRGbY+uWShdsolSD1wVXF/oYCsndGlhpFmWBpFZsIKSfNKs mKnFNCDykpwj72X7SlffiBg7BgWBP7WYReORW4taVW3oeZRYMMBQ5bW34SNaAX67RZRN FWNivS7aKKUrpwLkRDs5MTfsp583dvqvbskc9ovfQx+dbmQkXn2Xt1XRzwOxfFqqOVBd kUkVKpKsI1gkUxBOF7HJ8ZjYKR+cnUzPQuFSB1T1nSAeKV7Hk9udCS3Xu5aZ8N9d4sMM LHgQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=kUfqEZ5R; 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 e4-20020a636904000000b004fc2e8947aasi178664pgc.42.2023.03.13.11.43.13; Mon, 13 Mar 2023 11:43:26 -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=kUfqEZ5R; 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 S231469AbjCMSc4 (ORCPT + 99 others); Mon, 13 Mar 2023 14:32:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35180 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230429AbjCMScS (ORCPT ); Mon, 13 Mar 2023 14:32:18 -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 E046284F77 for ; Mon, 13 Mar 2023 11:31:11 -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 EBCEF61416 for ; Mon, 13 Mar 2023 18:30:22 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id AF613C433D2; Mon, 13 Mar 2023 18:30:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1678732222; bh=Pq2G49k2alsP0lshp/4ziB6Ad5l2/VR2KomD6ac0rUo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kUfqEZ5R6SeP12Ghuz5bEg3qzvRcz9s3SU1erP15Cm/X7xiYnD+nHFTDT0UCkap+V EtJK8RlOj9Eq0qcHHlodiXw00eT28MAAF9P4TAEgZ40mkMNFNngfjOhADQRMsllUA2 IVwYPOcgSGjy62qi+VIafjlJGZmXtRY9FgRuj/aQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: rafael@kernel.org, Greg Kroah-Hartman , "David S. Miller" , "James E.J. Bottomley" , "K. Y. Srinivasan" , "Martin K. Petersen" , Alex Shi , Alexander Gordeev , Alexandre Bounine , Alison Schofield , Ben Widawsky , Bjorn Helgaas , Dan Williams , Dexuan Cui , Eric Dumazet , Haiyang Zhang , Hannes Reinecke , Harald Freudenberger , Heiko Carstens , Hu Haowen , Ilya Dryomov , Ira Weiny , Iwona Winiarska , Jakub Kicinski , Jens Axboe , Jonathan Corbet , Laurentiu Tudor , Matt Porter , Michael Ellerman , Paolo Abeni , Stuart Yoder , Vasily Gorbik , Vishal Verma , Wei Liu , Yanteng Si Subject: [PATCH 23/36] driver core: bus: mark the struct bus_type for sysfs callbacks as constant Date: Mon, 13 Mar 2023 19:29:05 +0100 Message-Id: <20230313182918.1312597-23-gregkh@linuxfoundation.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230313182918.1312597-1-gregkh@linuxfoundation.org> References: <20230313182918.1312597-1-gregkh@linuxfoundation.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=30198; i=gregkh@linuxfoundation.org; h=from:subject; bh=Pq2G49k2alsP0lshp/4ziB6Ad5l2/VR2KomD6ac0rUo=; b=owGbwMvMwCRo6H6F97bub03G02pJDCn82VXx61asXPlckGV7FmcrO1PKdo67hYeOK+5U/X33x hbvtKD+jlgWBkEmBlkxRZYv23iO7q84pOhlaHsaZg4rE8gQBi5OAZiI4GeGBecuXIjbd2q1zaZd tiIMNo7L+9mY5RgWzL5x2aPTc837zMTQprL1+5+Ef/IMAQA= X-Developer-Key: i=gregkh@linuxfoundation.org; a=openpgp; fpr=F4B60CC5BF78C2214A313DCB3147D40DDB2DFB29 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, 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?1760279141141780634?= X-GMAIL-MSGID: =?utf-8?q?1760279141141780634?= struct bus_type should never be modified in a sysfs callback as there is nothing in the structure to modify, and frankly, the structure is almost never used in a sysfs callback, so mark it as constant to allow struct bus_type to be moved to read-only memory. Cc: "David S. Miller" Cc: "James E.J. Bottomley" Cc: "K. Y. Srinivasan" Cc: "Martin K. Petersen" Cc: Alex Shi Cc: Alexander Gordeev Cc: Alexandre Bounine Cc: Alison Schofield Cc: Ben Widawsky Cc: Bjorn Helgaas Cc: Dan Williams Cc: Dexuan Cui Cc: Eric Dumazet Cc: Haiyang Zhang Cc: Hannes Reinecke Cc: Harald Freudenberger Cc: Heiko Carstens Cc: Hu Haowen Cc: Ilya Dryomov Cc: Ira Weiny Cc: Iwona Winiarska Cc: Jakub Kicinski Cc: Jens Axboe Cc: Jonathan Corbet Cc: Laurentiu Tudor Cc: Matt Porter Cc: Michael Ellerman Cc: Paolo Abeni Cc: Stuart Yoder Cc: Vasily Gorbik Cc: Vishal Verma Cc: Wei Liu Cc: Yanteng Si Signed-off-by: Greg Kroah-Hartman Acked-by: Bjorn Helgaas # pci Acked-by: Wei Liu Acked-by: Ira Weiny # cxl Acked-by: Dan Williams Acked-by: Martin K. Petersen # scsi Acked-by: Ilya Dryomov # rbd Reviewed-by: Alex Shi Acked-by: Iwona Winiarska --- Note, this is a patch that is a prepatory cleanup as part of a larger series of patches that is working on resolving some old driver core design mistakes. It will build and apply cleanly on top of 6.3-rc2 on its own, but I'd prefer if I could take it through my driver-core tree so that the driver core changes can be taken through there for 6.4-rc1. Documentation/driver-api/driver-model/bus.rst | 4 +- Documentation/filesystems/sysfs.rst | 4 +- .../translations/zh_CN/filesystems/sysfs.txt | 4 +- .../translations/zh_TW/filesystems/sysfs.txt | 4 +- arch/powerpc/platforms/pseries/ibmebus.c | 4 +- arch/powerpc/platforms/pseries/vio.c | 8 ++-- drivers/ata/pata_parport/pata_parport.c | 6 +-- drivers/base/bus.c | 8 ++-- drivers/block/rbd.c | 34 +++++++-------- drivers/bus/fsl-mc/fsl-mc-bus.c | 6 +-- drivers/cxl/core/port.c | 2 +- drivers/hv/vmbus_drv.c | 2 +- drivers/net/netdevsim/bus.c | 4 +- drivers/pci/pci-sysfs.c | 2 +- drivers/pci/pci.c | 4 +- drivers/peci/sysfs.c | 2 +- drivers/rapidio/rio-sysfs.c | 2 +- drivers/s390/crypto/ap_bus.c | 42 +++++++++---------- drivers/scsi/fcoe/fcoe_sysfs.c | 8 ++-- drivers/scsi/fcoe/fcoe_transport.c | 6 +-- include/linux/device/bus.h | 4 +- include/scsi/libfcoe.h | 6 +-- 22 files changed, 78 insertions(+), 88 deletions(-) diff --git a/Documentation/driver-api/driver-model/bus.rst b/Documentation/driver-api/driver-model/bus.rst index 016b15a6e8ea..9709ab62a468 100644 --- a/Documentation/driver-api/driver-model/bus.rst +++ b/Documentation/driver-api/driver-model/bus.rst @@ -125,8 +125,8 @@ Exporting Attributes struct bus_attribute { struct attribute attr; - ssize_t (*show)(struct bus_type *, char * buf); - ssize_t (*store)(struct bus_type *, const char * buf, size_t count); + ssize_t (*show)(const struct bus_type *, char * buf); + ssize_t (*store)(const struct bus_type *, const char * buf, size_t count); }; Bus drivers can export attributes using the BUS_ATTR_RW macro that works diff --git a/Documentation/filesystems/sysfs.rst b/Documentation/filesystems/sysfs.rst index f8187d466b97..c32993bc83c7 100644 --- a/Documentation/filesystems/sysfs.rst +++ b/Documentation/filesystems/sysfs.rst @@ -373,8 +373,8 @@ Structure:: struct bus_attribute { struct attribute attr; - ssize_t (*show)(struct bus_type *, char * buf); - ssize_t (*store)(struct bus_type *, const char * buf, size_t count); + ssize_t (*show)(const struct bus_type *, char * buf); + ssize_t (*store)(const struct bus_type *, const char * buf, size_t count); }; Declaring:: diff --git a/Documentation/translations/zh_CN/filesystems/sysfs.txt b/Documentation/translations/zh_CN/filesystems/sysfs.txt index 046cc1d52058..547062759e60 100644 --- a/Documentation/translations/zh_CN/filesystems/sysfs.txt +++ b/Documentation/translations/zh_CN/filesystems/sysfs.txt @@ -329,8 +329,8 @@ void device_remove_file(struct device *dev, const struct device_attribute * attr struct bus_attribute { struct attribute attr; - ssize_t (*show)(struct bus_type *, char * buf); - ssize_t (*store)(struct bus_type *, const char * buf, size_t count); + ssize_t (*show)(const struct bus_type *, char * buf); + ssize_t (*store)(const struct bus_type *, const char * buf, size_t count); }; 声明: diff --git a/Documentation/translations/zh_TW/filesystems/sysfs.txt b/Documentation/translations/zh_TW/filesystems/sysfs.txt index acd677f19d4f..280824cc7e5d 100644 --- a/Documentation/translations/zh_TW/filesystems/sysfs.txt +++ b/Documentation/translations/zh_TW/filesystems/sysfs.txt @@ -332,8 +332,8 @@ void device_remove_file(struct device *dev, const struct device_attribute * attr struct bus_attribute { struct attribute attr; - ssize_t (*show)(struct bus_type *, char * buf); - ssize_t (*store)(struct bus_type *, const char * buf, size_t count); + ssize_t (*show)(const struct bus_type *, char * buf); + ssize_t (*store)(const struct bus_type *, const char * buf, size_t count); }; 聲明: diff --git a/arch/powerpc/platforms/pseries/ibmebus.c b/arch/powerpc/platforms/pseries/ibmebus.c index bb9c18682783..44703f13985b 100644 --- a/arch/powerpc/platforms/pseries/ibmebus.c +++ b/arch/powerpc/platforms/pseries/ibmebus.c @@ -267,7 +267,7 @@ static char *ibmebus_chomp(const char *in, size_t count) return out; } -static ssize_t probe_store(struct bus_type *bus, const char *buf, size_t count) +static ssize_t probe_store(const struct bus_type *bus, const char *buf, size_t count) { struct device_node *dn = NULL; struct device *dev; @@ -305,7 +305,7 @@ static ssize_t probe_store(struct bus_type *bus, const char *buf, size_t count) } static BUS_ATTR_WO(probe); -static ssize_t remove_store(struct bus_type *bus, const char *buf, size_t count) +static ssize_t remove_store(const struct bus_type *bus, const char *buf, size_t count) { struct device *dev; char *path; diff --git a/arch/powerpc/platforms/pseries/vio.c b/arch/powerpc/platforms/pseries/vio.c index 770df9351aaa..bf7aff6390be 100644 --- a/arch/powerpc/platforms/pseries/vio.c +++ b/arch/powerpc/platforms/pseries/vio.c @@ -1006,7 +1006,7 @@ ATTRIBUTE_GROUPS(vio_cmo_dev); /* sysfs bus functions and data structures for CMO */ #define viobus_cmo_rd_attr(name) \ -static ssize_t cmo_bus_##name##_show(struct bus_type *bt, char *buf) \ +static ssize_t cmo_bus_##name##_show(const struct bus_type *bt, char *buf) \ { \ return sprintf(buf, "%lu\n", vio_cmo.name); \ } \ @@ -1015,7 +1015,7 @@ static struct bus_attribute bus_attr_cmo_bus_##name = \ #define viobus_cmo_pool_rd_attr(name, var) \ static ssize_t \ -cmo_##name##_##var##_show(struct bus_type *bt, char *buf) \ +cmo_##name##_##var##_show(const struct bus_type *bt, char *buf) \ { \ return sprintf(buf, "%lu\n", vio_cmo.name.var); \ } \ @@ -1030,12 +1030,12 @@ viobus_cmo_pool_rd_attr(reserve, size); viobus_cmo_pool_rd_attr(excess, size); viobus_cmo_pool_rd_attr(excess, free); -static ssize_t cmo_high_show(struct bus_type *bt, char *buf) +static ssize_t cmo_high_show(const struct bus_type *bt, char *buf) { return sprintf(buf, "%lu\n", vio_cmo.high); } -static ssize_t cmo_high_store(struct bus_type *bt, const char *buf, +static ssize_t cmo_high_store(const struct bus_type *bt, const char *buf, size_t count) { unsigned long flags; diff --git a/drivers/ata/pata_parport/pata_parport.c b/drivers/ata/pata_parport/pata_parport.c index 294a266a0dda..64d1bde26940 100644 --- a/drivers/ata/pata_parport/pata_parport.c +++ b/drivers/ata/pata_parport/pata_parport.c @@ -554,8 +554,7 @@ void pata_parport_unregister_driver(struct pi_protocol *pr) } EXPORT_SYMBOL_GPL(pata_parport_unregister_driver); -static ssize_t new_device_store(struct bus_type *bus, const char *buf, - size_t count) +static ssize_t new_device_store(const struct bus_type *bus, const char *buf, size_t count) { char port[12] = "auto"; char protocol[8] = "auto"; @@ -630,8 +629,7 @@ static void pi_remove_one(struct device *dev) /* pata_parport_dev_release will do kfree(pi) */ } -static ssize_t delete_device_store(struct bus_type *bus, const char *buf, - size_t count) +static ssize_t delete_device_store(const struct bus_type *bus, const char *buf, size_t count) { struct device *dev; diff --git a/drivers/base/bus.c b/drivers/base/bus.c index 91a6b6b1fc49..819ab745fa9f 100644 --- a/drivers/base/bus.c +++ b/drivers/base/bus.c @@ -274,7 +274,7 @@ static ssize_t bind_store(struct device_driver *drv, const char *buf, } static DRIVER_ATTR_IGNORE_LOCKDEP(bind, 0200, NULL, bind_store); -static ssize_t drivers_autoprobe_show(struct bus_type *bus, char *buf) +static ssize_t drivers_autoprobe_show(const struct bus_type *bus, char *buf) { struct subsys_private *sp = bus_to_subsys(bus); int ret; @@ -287,7 +287,7 @@ static ssize_t drivers_autoprobe_show(struct bus_type *bus, char *buf) return ret; } -static ssize_t drivers_autoprobe_store(struct bus_type *bus, +static ssize_t drivers_autoprobe_store(const struct bus_type *bus, const char *buf, size_t count) { struct subsys_private *sp = bus_to_subsys(bus); @@ -304,7 +304,7 @@ static ssize_t drivers_autoprobe_store(struct bus_type *bus, return count; } -static ssize_t drivers_probe_store(struct bus_type *bus, +static ssize_t drivers_probe_store(const struct bus_type *bus, const char *buf, size_t count) { struct device *dev; @@ -808,7 +808,7 @@ static void klist_devices_put(struct klist_node *n) put_device(dev); } -static ssize_t bus_uevent_store(struct bus_type *bus, +static ssize_t bus_uevent_store(const struct bus_type *bus, const char *buf, size_t count) { struct subsys_private *sp = bus_to_subsys(bus); diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index 5cb008b9700a..84ad3b17956f 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -491,12 +491,12 @@ static bool single_major = true; module_param(single_major, bool, 0444); MODULE_PARM_DESC(single_major, "Use a single major number for all rbd devices (default: true)"); -static ssize_t add_store(struct bus_type *bus, const char *buf, size_t count); -static ssize_t remove_store(struct bus_type *bus, const char *buf, +static ssize_t add_store(const struct bus_type *bus, const char *buf, size_t count); +static ssize_t remove_store(const struct bus_type *bus, const char *buf, size_t count); -static ssize_t add_single_major_store(struct bus_type *bus, const char *buf, +static ssize_t add_single_major_store(const struct bus_type *bus, const char *buf, size_t count); -static ssize_t remove_single_major_store(struct bus_type *bus, const char *buf, +static ssize_t remove_single_major_store(const struct bus_type *bus, const char *buf, size_t count); static int rbd_dev_image_probe(struct rbd_device *rbd_dev, int depth); @@ -538,7 +538,7 @@ static bool rbd_is_lock_owner(struct rbd_device *rbd_dev) return is_lock_owner; } -static ssize_t supported_features_show(struct bus_type *bus, char *buf) +static ssize_t supported_features_show(const struct bus_type *bus, char *buf) { return sprintf(buf, "0x%llx\n", RBD_FEATURES_SUPPORTED); } @@ -6967,9 +6967,7 @@ static int rbd_dev_image_probe(struct rbd_device *rbd_dev, int depth) return ret; } -static ssize_t do_rbd_add(struct bus_type *bus, - const char *buf, - size_t count) +static ssize_t do_rbd_add(const char *buf, size_t count) { struct rbd_device *rbd_dev = NULL; struct ceph_options *ceph_opts = NULL; @@ -7081,18 +7079,18 @@ static ssize_t do_rbd_add(struct bus_type *bus, goto out; } -static ssize_t add_store(struct bus_type *bus, const char *buf, size_t count) +static ssize_t add_store(const struct bus_type *bus, const char *buf, size_t count) { if (single_major) return -EINVAL; - return do_rbd_add(bus, buf, count); + return do_rbd_add(buf, count); } -static ssize_t add_single_major_store(struct bus_type *bus, const char *buf, +static ssize_t add_single_major_store(const struct bus_type *bus, const char *buf, size_t count) { - return do_rbd_add(bus, buf, count); + return do_rbd_add(buf, count); } static void rbd_dev_remove_parent(struct rbd_device *rbd_dev) @@ -7122,9 +7120,7 @@ static void rbd_dev_remove_parent(struct rbd_device *rbd_dev) } } -static ssize_t do_rbd_remove(struct bus_type *bus, - const char *buf, - size_t count) +static ssize_t do_rbd_remove(const char *buf, size_t count) { struct rbd_device *rbd_dev = NULL; struct list_head *tmp; @@ -7196,18 +7192,18 @@ static ssize_t do_rbd_remove(struct bus_type *bus, return count; } -static ssize_t remove_store(struct bus_type *bus, const char *buf, size_t count) +static ssize_t remove_store(const struct bus_type *bus, const char *buf, size_t count) { if (single_major) return -EINVAL; - return do_rbd_remove(bus, buf, count); + return do_rbd_remove(buf, count); } -static ssize_t remove_single_major_store(struct bus_type *bus, const char *buf, +static ssize_t remove_single_major_store(const struct bus_type *bus, const char *buf, size_t count) { - return do_rbd_remove(bus, buf, count); + return do_rbd_remove(buf, count); } /* diff --git a/drivers/bus/fsl-mc/fsl-mc-bus.c b/drivers/bus/fsl-mc/fsl-mc-bus.c index 36cb091a33b4..653e2d4c116f 100644 --- a/drivers/bus/fsl-mc/fsl-mc-bus.c +++ b/drivers/bus/fsl-mc/fsl-mc-bus.c @@ -231,7 +231,7 @@ static int scan_fsl_mc_bus(struct device *dev, void *data) return 0; } -static ssize_t rescan_store(struct bus_type *bus, +static ssize_t rescan_store(const struct bus_type *bus, const char *buf, size_t count) { unsigned long val; @@ -284,7 +284,7 @@ static int fsl_mc_bus_get_autorescan(struct device *dev, void *data) return 0; } -static ssize_t autorescan_store(struct bus_type *bus, +static ssize_t autorescan_store(const struct bus_type *bus, const char *buf, size_t count) { bus_for_each_dev(bus, NULL, (void *)buf, fsl_mc_bus_set_autorescan); @@ -292,7 +292,7 @@ static ssize_t autorescan_store(struct bus_type *bus, return count; } -static ssize_t autorescan_show(struct bus_type *bus, char *buf) +static ssize_t autorescan_show(const struct bus_type *bus, char *buf) { bus_for_each_dev(bus, NULL, (void *)buf, fsl_mc_bus_get_autorescan); return strlen(buf); diff --git a/drivers/cxl/core/port.c b/drivers/cxl/core/port.c index 8ee6b6e2e2a4..66333cd6248e 100644 --- a/drivers/cxl/core/port.c +++ b/drivers/cxl/core/port.c @@ -1927,7 +1927,7 @@ bool schedule_cxl_memdev_detach(struct cxl_memdev *cxlmd) EXPORT_SYMBOL_NS_GPL(schedule_cxl_memdev_detach, CXL); /* for user tooling to ensure port disable work has completed */ -static ssize_t flush_store(struct bus_type *bus, const char *buf, size_t count) +static ssize_t flush_store(const struct bus_type *bus, const char *buf, size_t count) { if (sysfs_streq(buf, "1")) { flush_workqueue(cxl_bus_wq); diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c index d24dd65b33d4..513adba09f56 100644 --- a/drivers/hv/vmbus_drv.c +++ b/drivers/hv/vmbus_drv.c @@ -684,7 +684,7 @@ static const struct attribute_group vmbus_dev_group = { __ATTRIBUTE_GROUPS(vmbus_dev); /* Set up the attribute for /sys/bus/vmbus/hibernation */ -static ssize_t hibernation_show(struct bus_type *bus, char *buf) +static ssize_t hibernation_show(const struct bus_type *bus, char *buf) { return sprintf(buf, "%d\n", !!hv_is_hibernation_supported()); } diff --git a/drivers/net/netdevsim/bus.c b/drivers/net/netdevsim/bus.c index 0052968e881e..0787ad252dd9 100644 --- a/drivers/net/netdevsim/bus.c +++ b/drivers/net/netdevsim/bus.c @@ -132,7 +132,7 @@ static struct nsim_bus_dev * nsim_bus_dev_new(unsigned int id, unsigned int port_count, unsigned int num_queues); static ssize_t -new_device_store(struct bus_type *bus, const char *buf, size_t count) +new_device_store(const struct bus_type *bus, const char *buf, size_t count) { unsigned int id, port_count, num_queues; struct nsim_bus_dev *nsim_bus_dev; @@ -186,7 +186,7 @@ static BUS_ATTR_WO(new_device); static void nsim_bus_dev_del(struct nsim_bus_dev *nsim_bus_dev); static ssize_t -del_device_store(struct bus_type *bus, const char *buf, size_t count) +del_device_store(const struct bus_type *bus, const char *buf, size_t count) { struct nsim_bus_dev *nsim_bus_dev, *tmp; unsigned int id; diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c index dd0d9d9bc509..ab32a91f287b 100644 --- a/drivers/pci/pci-sysfs.c +++ b/drivers/pci/pci-sysfs.c @@ -428,7 +428,7 @@ static ssize_t msi_bus_store(struct device *dev, struct device_attribute *attr, } static DEVICE_ATTR_RW(msi_bus); -static ssize_t rescan_store(struct bus_type *bus, const char *buf, size_t count) +static ssize_t rescan_store(const struct bus_type *bus, const char *buf, size_t count) { unsigned long val; struct pci_bus *b = NULL; diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 7a67611dc5f4..45c3bb039f21 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -6679,7 +6679,7 @@ void pci_reassigndev_resource_alignment(struct pci_dev *dev) } } -static ssize_t resource_alignment_show(struct bus_type *bus, char *buf) +static ssize_t resource_alignment_show(const struct bus_type *bus, char *buf) { size_t count = 0; @@ -6691,7 +6691,7 @@ static ssize_t resource_alignment_show(struct bus_type *bus, char *buf) return count; } -static ssize_t resource_alignment_store(struct bus_type *bus, +static ssize_t resource_alignment_store(const struct bus_type *bus, const char *buf, size_t count) { char *param, *old, *end; diff --git a/drivers/peci/sysfs.c b/drivers/peci/sysfs.c index db9ef05776e3..c04244075794 100644 --- a/drivers/peci/sysfs.c +++ b/drivers/peci/sysfs.c @@ -15,7 +15,7 @@ static int rescan_controller(struct device *dev, void *data) return peci_controller_scan_devices(to_peci_controller(dev)); } -static ssize_t rescan_store(struct bus_type *bus, const char *buf, size_t count) +static ssize_t rescan_store(const struct bus_type *bus, const char *buf, size_t count) { bool res; int ret; diff --git a/drivers/rapidio/rio-sysfs.c b/drivers/rapidio/rio-sysfs.c index f7679602498e..90d391210533 100644 --- a/drivers/rapidio/rio-sysfs.c +++ b/drivers/rapidio/rio-sysfs.c @@ -286,7 +286,7 @@ const struct attribute_group *rio_dev_groups[] = { NULL, }; -static ssize_t scan_store(struct bus_type *bus, const char *buf, size_t count) +static ssize_t scan_store(const struct bus_type *bus, const char *buf, size_t count) { long val; int rc; diff --git a/drivers/s390/crypto/ap_bus.c b/drivers/s390/crypto/ap_bus.c index f4cc1720156f..5a99e0b18289 100644 --- a/drivers/s390/crypto/ap_bus.c +++ b/drivers/s390/crypto/ap_bus.c @@ -1166,12 +1166,12 @@ EXPORT_SYMBOL(ap_parse_mask_str); * AP bus attributes. */ -static ssize_t ap_domain_show(struct bus_type *bus, char *buf) +static ssize_t ap_domain_show(const struct bus_type *bus, char *buf) { return scnprintf(buf, PAGE_SIZE, "%d\n", ap_domain_index); } -static ssize_t ap_domain_store(struct bus_type *bus, +static ssize_t ap_domain_store(const struct bus_type *bus, const char *buf, size_t count) { int domain; @@ -1193,7 +1193,7 @@ static ssize_t ap_domain_store(struct bus_type *bus, static BUS_ATTR_RW(ap_domain); -static ssize_t ap_control_domain_mask_show(struct bus_type *bus, char *buf) +static ssize_t ap_control_domain_mask_show(const struct bus_type *bus, char *buf) { if (!ap_qci_info) /* QCI not supported */ return scnprintf(buf, PAGE_SIZE, "not supported\n"); @@ -1208,7 +1208,7 @@ static ssize_t ap_control_domain_mask_show(struct bus_type *bus, char *buf) static BUS_ATTR_RO(ap_control_domain_mask); -static ssize_t ap_usage_domain_mask_show(struct bus_type *bus, char *buf) +static ssize_t ap_usage_domain_mask_show(const struct bus_type *bus, char *buf) { if (!ap_qci_info) /* QCI not supported */ return scnprintf(buf, PAGE_SIZE, "not supported\n"); @@ -1223,7 +1223,7 @@ static ssize_t ap_usage_domain_mask_show(struct bus_type *bus, char *buf) static BUS_ATTR_RO(ap_usage_domain_mask); -static ssize_t ap_adapter_mask_show(struct bus_type *bus, char *buf) +static ssize_t ap_adapter_mask_show(const struct bus_type *bus, char *buf) { if (!ap_qci_info) /* QCI not supported */ return scnprintf(buf, PAGE_SIZE, "not supported\n"); @@ -1238,7 +1238,7 @@ static ssize_t ap_adapter_mask_show(struct bus_type *bus, char *buf) static BUS_ATTR_RO(ap_adapter_mask); -static ssize_t ap_interrupts_show(struct bus_type *bus, char *buf) +static ssize_t ap_interrupts_show(const struct bus_type *bus, char *buf) { return scnprintf(buf, PAGE_SIZE, "%d\n", ap_irq_flag ? 1 : 0); @@ -1246,12 +1246,12 @@ static ssize_t ap_interrupts_show(struct bus_type *bus, char *buf) static BUS_ATTR_RO(ap_interrupts); -static ssize_t config_time_show(struct bus_type *bus, char *buf) +static ssize_t config_time_show(const struct bus_type *bus, char *buf) { return scnprintf(buf, PAGE_SIZE, "%d\n", ap_config_time); } -static ssize_t config_time_store(struct bus_type *bus, +static ssize_t config_time_store(const struct bus_type *bus, const char *buf, size_t count) { int time; @@ -1265,12 +1265,12 @@ static ssize_t config_time_store(struct bus_type *bus, static BUS_ATTR_RW(config_time); -static ssize_t poll_thread_show(struct bus_type *bus, char *buf) +static ssize_t poll_thread_show(const struct bus_type *bus, char *buf) { return scnprintf(buf, PAGE_SIZE, "%d\n", ap_poll_kthread ? 1 : 0); } -static ssize_t poll_thread_store(struct bus_type *bus, +static ssize_t poll_thread_store(const struct bus_type *bus, const char *buf, size_t count) { int flag, rc; @@ -1289,12 +1289,12 @@ static ssize_t poll_thread_store(struct bus_type *bus, static BUS_ATTR_RW(poll_thread); -static ssize_t poll_timeout_show(struct bus_type *bus, char *buf) +static ssize_t poll_timeout_show(const struct bus_type *bus, char *buf) { return scnprintf(buf, PAGE_SIZE, "%llu\n", poll_timeout); } -static ssize_t poll_timeout_store(struct bus_type *bus, const char *buf, +static ssize_t poll_timeout_store(const struct bus_type *bus, const char *buf, size_t count) { unsigned long long time; @@ -1318,21 +1318,21 @@ static ssize_t poll_timeout_store(struct bus_type *bus, const char *buf, static BUS_ATTR_RW(poll_timeout); -static ssize_t ap_max_domain_id_show(struct bus_type *bus, char *buf) +static ssize_t ap_max_domain_id_show(const struct bus_type *bus, char *buf) { return scnprintf(buf, PAGE_SIZE, "%d\n", ap_max_domain_id); } static BUS_ATTR_RO(ap_max_domain_id); -static ssize_t ap_max_adapter_id_show(struct bus_type *bus, char *buf) +static ssize_t ap_max_adapter_id_show(const struct bus_type *bus, char *buf) { return scnprintf(buf, PAGE_SIZE, "%d\n", ap_max_adapter_id); } static BUS_ATTR_RO(ap_max_adapter_id); -static ssize_t apmask_show(struct bus_type *bus, char *buf) +static ssize_t apmask_show(const struct bus_type *bus, char *buf) { int rc; @@ -1393,7 +1393,7 @@ static int apmask_commit(unsigned long *newapm) return 0; } -static ssize_t apmask_store(struct bus_type *bus, const char *buf, +static ssize_t apmask_store(const struct bus_type *bus, const char *buf, size_t count) { int rc, changes = 0; @@ -1425,7 +1425,7 @@ static ssize_t apmask_store(struct bus_type *bus, const char *buf, static BUS_ATTR_RW(apmask); -static ssize_t aqmask_show(struct bus_type *bus, char *buf) +static ssize_t aqmask_show(const struct bus_type *bus, char *buf) { int rc; @@ -1486,7 +1486,7 @@ static int aqmask_commit(unsigned long *newaqm) return 0; } -static ssize_t aqmask_store(struct bus_type *bus, const char *buf, +static ssize_t aqmask_store(const struct bus_type *bus, const char *buf, size_t count) { int rc, changes = 0; @@ -1518,13 +1518,13 @@ static ssize_t aqmask_store(struct bus_type *bus, const char *buf, static BUS_ATTR_RW(aqmask); -static ssize_t scans_show(struct bus_type *bus, char *buf) +static ssize_t scans_show(const struct bus_type *bus, char *buf) { return scnprintf(buf, PAGE_SIZE, "%llu\n", atomic64_read(&ap_scan_bus_count)); } -static ssize_t scans_store(struct bus_type *bus, const char *buf, +static ssize_t scans_store(const struct bus_type *bus, const char *buf, size_t count) { AP_DBF_INFO("%s force AP bus rescan\n", __func__); @@ -1536,7 +1536,7 @@ static ssize_t scans_store(struct bus_type *bus, const char *buf, static BUS_ATTR_RW(scans); -static ssize_t bindings_show(struct bus_type *bus, char *buf) +static ssize_t bindings_show(const struct bus_type *bus, char *buf) { int rc; unsigned int apqns, n; diff --git a/drivers/scsi/fcoe/fcoe_sysfs.c b/drivers/scsi/fcoe/fcoe_sysfs.c index 6260aa5ea6af..e17957f8085c 100644 --- a/drivers/scsi/fcoe/fcoe_sysfs.c +++ b/drivers/scsi/fcoe/fcoe_sysfs.c @@ -659,17 +659,17 @@ static const struct device_type fcoe_fcf_device_type = { .release = fcoe_fcf_device_release, }; -static ssize_t ctlr_create_store(struct bus_type *bus, const char *buf, +static ssize_t ctlr_create_store(const struct bus_type *bus, const char *buf, size_t count) { - return fcoe_ctlr_create_store(bus, buf, count); + return fcoe_ctlr_create_store(buf, count); } static BUS_ATTR_WO(ctlr_create); -static ssize_t ctlr_destroy_store(struct bus_type *bus, const char *buf, +static ssize_t ctlr_destroy_store(const struct bus_type *bus, const char *buf, size_t count) { - return fcoe_ctlr_destroy_store(bus, buf, count); + return fcoe_ctlr_destroy_store(buf, count); } static BUS_ATTR_WO(ctlr_destroy); diff --git a/drivers/scsi/fcoe/fcoe_transport.c b/drivers/scsi/fcoe/fcoe_transport.c index 62341c6353a7..46b0bf237be1 100644 --- a/drivers/scsi/fcoe/fcoe_transport.c +++ b/drivers/scsi/fcoe/fcoe_transport.c @@ -745,8 +745,7 @@ static int libfcoe_device_notification(struct notifier_block *notifier, return NOTIFY_OK; } -ssize_t fcoe_ctlr_create_store(struct bus_type *bus, - const char *buf, size_t count) +ssize_t fcoe_ctlr_create_store(const char *buf, size_t count) { struct net_device *netdev = NULL; struct fcoe_transport *ft = NULL; @@ -808,8 +807,7 @@ ssize_t fcoe_ctlr_create_store(struct bus_type *bus, return count; } -ssize_t fcoe_ctlr_destroy_store(struct bus_type *bus, - const char *buf, size_t count) +ssize_t fcoe_ctlr_destroy_store(const char *buf, size_t count) { int rc = -ENODEV; struct net_device *netdev = NULL; diff --git a/include/linux/device/bus.h b/include/linux/device/bus.h index c258e8770285..78c875386c06 100644 --- a/include/linux/device/bus.h +++ b/include/linux/device/bus.h @@ -118,8 +118,8 @@ extern int __must_check bus_rescan_devices(struct bus_type *bus); struct bus_attribute { struct attribute attr; - ssize_t (*show)(struct bus_type *bus, char *buf); - ssize_t (*store)(struct bus_type *bus, const char *buf, size_t count); + ssize_t (*show)(const struct bus_type *bus, char *buf); + ssize_t (*store)(const struct bus_type *bus, const char *buf, size_t count); }; #define BUS_ATTR_RW(_name) \ diff --git a/include/scsi/libfcoe.h b/include/scsi/libfcoe.h index 279782156373..8300ef1a982e 100644 --- a/include/scsi/libfcoe.h +++ b/include/scsi/libfcoe.h @@ -397,10 +397,8 @@ int fcoe_transport_attach(struct fcoe_transport *ft); int fcoe_transport_detach(struct fcoe_transport *ft); /* sysfs store handler for ctrl_control interface */ -ssize_t fcoe_ctlr_create_store(struct bus_type *bus, - const char *buf, size_t count); -ssize_t fcoe_ctlr_destroy_store(struct bus_type *bus, - const char *buf, size_t count); +ssize_t fcoe_ctlr_create_store(const char *buf, size_t count); +ssize_t fcoe_ctlr_destroy_store(const char *buf, size_t count); #endif /* _LIBFCOE_H */ From patchwork Mon Mar 13 18:29:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 69018 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1345259wrd; Mon, 13 Mar 2023 11:42:24 -0700 (PDT) X-Google-Smtp-Source: AK7set+5ygehzdRc+KJxvKDftA0IRbdrnbFu1kEUaIOeN+xlluT8WbtGH1shMzpjAqtJVZS1OhsZ X-Received: by 2002:a05:6a20:8f27:b0:cc:65c3:c8cb with SMTP id b39-20020a056a208f2700b000cc65c3c8cbmr36659597pzk.42.1678732944718; Mon, 13 Mar 2023 11:42:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678732944; cv=none; d=google.com; s=arc-20160816; b=sDONuqyA/rP6yv774TiW1Ps9gwzjN60pC3e42lV4BzYt0b+Qv9W3HZWNSHJurD72iB FZ32u9AbSQFeehluzth4SGPcYh2RZMTk5Cjik3WxBRFeHqsxC6CuXHaw+0jMSlPxDP2g Nk2RdetkGvK8ngb4j3141ZItrl/w3ctWNszOZk9I+F9FU6Ndl73zKIT7D9R3myVQYwfJ MT3YRv5fKEFCUtWXm1rwc38x60BzyZ5ulTWdszn6hfeDL2+7OHIGxd7aeqAwLGiedIua EZnXlYrcagqooHIknfEFjotaDj9vp3mfQHeUFPX1JBvvULIGQPhb5V0CZuBM9KghGrEx O+cg== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Awlfz0SkLnzXmSuDQv/3vQMIO4BS1NmJaS1qLeNp3NI=; b=PU8yNzi1CcRhb+skyN5GMKKKik0cnwx817PhUuuxVconmRg6EPbZMXXjuovuiKYyYv qU/KQ13AG9SguFWxmLX8SI8MGtDueZOD/Vb50KPFphkF9792vZjDKheVBkUCX3a9259W vf7/BcpahB2V/8rIAEUdF10iFYfqwFuT+4zR11LSZVP25vU60MrU2fPrzfyl3MaiLfRJ RrzKzt2vSuTn7F1t9Mc060yGUtvBQwIZDWdix3Z3KUQlvwAPd1ZRTI4kuLFpXy28KcR1 6DEkHOT7fTGUb5Nri2k1tMH1e3YkeY0CWugplXNz68FSSZV7R9ec3YlM8rt9AZXo+cUB r22w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=gGraI953; 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 r188-20020a632bc5000000b004fbbb35999dsi115129pgr.832.2023.03.13.11.42.12; Mon, 13 Mar 2023 11:42:24 -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=gGraI953; 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 S231357AbjCMSbn (ORCPT + 99 others); Mon, 13 Mar 2023 14:31:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35304 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231287AbjCMSbF (ORCPT ); Mon, 13 Mar 2023 14:31:05 -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 8C908848D1 for ; Mon, 13 Mar 2023 11:30:39 -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 1150261468 for ; Mon, 13 Mar 2023 18:30:39 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 22936C433D2; Mon, 13 Mar 2023 18:30:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1678732238; bh=2ZmWFDJP7W9Eu0QlisAwd3I2utOuVhHKcxmoQW6TiXI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gGraI953dU2dZ0Nusru0tb87Wdlaj65SktviZ5w0V9ohBhs5FZIyENihQoBFSb4yJ 8q6raFbGcA9U8RavAWu7jTrJA9BpjRtnlqDIXQcl5zEUbgwGVSPrWSwfoJz1TaPppp kf4ETJUT3aUtdlXITXA5Cl1YvnNBCQ+Qcuu7zMtY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: rafael@kernel.org, Greg Kroah-Hartman Subject: [PATCH 24/36] driver core: bus: constantify bus_register() Date: Mon, 13 Mar 2023 19:29:06 +0100 Message-Id: <20230313182918.1312597-24-gregkh@linuxfoundation.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230313182918.1312597-1-gregkh@linuxfoundation.org> References: <20230313182918.1312597-1-gregkh@linuxfoundation.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1810; i=gregkh@linuxfoundation.org; h=from:subject; bh=2ZmWFDJP7W9Eu0QlisAwd3I2utOuVhHKcxmoQW6TiXI=; b=owGbwMvMwCRo6H6F97bub03G02pJDCn82VVcAoekqg6erF/9rMh4tZxPzrkTYedXcqtnSZ50M nuadSmmI5aFQZCJQVZMkeXLNp6j+ysOKXoZ2p6GmcPKBDKEgYtTACayRIRhfrlw+IEek1d1B+Na LvXafWtkv+FQxbBgfURPy9m+9VNezPFrvfXj6Rr5W/oeAA== X-Developer-Key: i=gregkh@linuxfoundation.org; a=openpgp; fpr=F4B60CC5BF78C2214A313DCB3147D40DDB2DFB29 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, 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?1760279076002507375?= X-GMAIL-MSGID: =?utf-8?q?1760279076002507375?= bus_register() is now safe to take a constant * to bus_type, so make that change and mark the subsys_private bus_type * constant as well. Cc: "Rafael J. Wysocki" Signed-off-by: Greg Kroah-Hartman --- drivers/base/base.h | 2 +- drivers/base/bus.c | 2 +- include/linux/device/bus.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/base/base.h b/drivers/base/base.h index f1034e27e651..09c6682d16b5 100644 --- a/drivers/base/base.h +++ b/drivers/base/base.h @@ -49,7 +49,7 @@ struct subsys_private { struct klist klist_drivers; struct blocking_notifier_head bus_notifier; unsigned int drivers_autoprobe:1; - struct bus_type *bus; + const struct bus_type *bus; struct device *dev_root; struct kset glue_dirs; diff --git a/drivers/base/bus.c b/drivers/base/bus.c index 819ab745fa9f..f739a2a79e59 100644 --- a/drivers/base/bus.c +++ b/drivers/base/bus.c @@ -841,7 +841,7 @@ static struct bus_attribute bus_attr_uevent = __ATTR(uevent, 0200, NULL, * infrastructure, then register the children subsystems it has: * the devices and drivers that belong to the subsystem. */ -int bus_register(struct bus_type *bus) +int bus_register(const struct bus_type *bus) { int retval; struct subsys_private *priv; diff --git a/include/linux/device/bus.h b/include/linux/device/bus.h index 78c875386c06..c30c4748c170 100644 --- a/include/linux/device/bus.h +++ b/include/linux/device/bus.h @@ -110,7 +110,7 @@ struct bus_type { bool need_parent_lock; }; -extern int __must_check bus_register(struct bus_type *bus); +extern int __must_check bus_register(const struct bus_type *bus); extern void bus_unregister(const struct bus_type *bus); From patchwork Mon Mar 13 18:29:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 69055 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1356395wrd; Mon, 13 Mar 2023 12:08:31 -0700 (PDT) X-Google-Smtp-Source: AK7set/sJkfazHkw0DYepJgu8NE8RKfzHARPwloBK7FnRYo8Oh0JysMy9nLsY0AmXwNTzJQTiAi5 X-Received: by 2002:a05:6a20:1615:b0:d4:818a:2593 with SMTP id l21-20020a056a20161500b000d4818a2593mr2971179pzj.10.1678734511470; Mon, 13 Mar 2023 12:08:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678734511; cv=none; d=google.com; s=arc-20160816; b=LWa8oWnbd93CGgPIs7MJEygBmWzy3200yy7beMDxC1c6PPseurZ6q7oojmZTw0E/// 5D47TEQ1leb5UVCWEFD8Y4x0BLsyPeShoG96Kol/PjWqR8fJdFnfLb/AoBXMA0om7TKO n2+bbdZ7QBq17AbT4tl/W4VMblDBo/IDdiGNKmmCBir+kc1SqbE5PUqwA35KHfsf/+81 NoJHAXK/KHTzLygYa3qlblZMgcVx9pXz+ac8I9+Re2devFUOBpoqfO5zhPD4jaf5s3TK AdEEjTixo80lA9b531zgq6hCaiQ4e6sh58NAIkOMhOGx73Dd4MpC4ehYb63rgTcmBBxX t8dA== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=jH/+1KxKgno1CsCm+78Oo4ht2Xyyxfuli0qdo3/rcdA=; b=oiKRnssGgCXC5Jct6jTD49e5aBMpzrnLuATaUiyX2DIVFlK5+QXF25JPO8JvUxLi48 KDZQICxQrAzYImzkF1eiSMqaQYJnXvyhbdtol6Mq0cM+wMu2FW3FoxP4DD0xLDCAhS8V ktjqbTAMTnFgJq3hiWgQq51FJeuzdiZ5zJWrEBGdmGS+XRhzcxpdwtRcCU1flJUZd9NG /BJCB3BhZ1KIzzduutSQLC90Q+PrBNVtvYOzGhzsJW89MbtD7FuYwiYuP/bTgpRwfIlI rjFEx+y1kytV32HkQu/tOKuxodxSPy99pJvuAbnr7kzkiJeTB9RNpn/cu0pGu6kkbSSW lF9Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=zPhUcsIY; 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 k3-20020a632403000000b004fb73b9a406si199557pgk.636.2023.03.13.12.08.17; Mon, 13 Mar 2023 12:08:31 -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=zPhUcsIY; 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 S231239AbjCMSc0 (ORCPT + 99 others); Mon, 13 Mar 2023 14:32:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33464 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231304AbjCMSbr (ORCPT ); Mon, 13 Mar 2023 14:31:47 -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 1437B83167 for ; Mon, 13 Mar 2023 11:30:59 -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 A71B66148D for ; Mon, 13 Mar 2023 18:30:41 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id BB015C433A7; Mon, 13 Mar 2023 18:30:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1678732241; bh=NAMwfV4LXKVlZrKLBvSDA4tAh1lT6Itj7zD+l/JKnWg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zPhUcsIYC0CBVQx6E5sTK60w0TGLRcnknw6rpxTZjtKL58R4FXiivBQEoxTD0dwWS HIGntxEUZnQ2+tFWsSTh5iImWobLwbsRddj2U/adllkrJbxbdBnqiJ59Ja8zO2iw7V PC3Kit6WubZXiU8GM6ItIXro5jfe0KR3VLcccdN0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: rafael@kernel.org, Greg Kroah-Hartman Subject: [PATCH 25/36] driver core: bus: constify bus_rescan_devices() Date: Mon, 13 Mar 2023 19:29:07 +0100 Message-Id: <20230313182918.1312597-25-gregkh@linuxfoundation.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230313182918.1312597-1-gregkh@linuxfoundation.org> References: <20230313182918.1312597-1-gregkh@linuxfoundation.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1512; i=gregkh@linuxfoundation.org; h=from:subject; bh=NAMwfV4LXKVlZrKLBvSDA4tAh1lT6Itj7zD+l/JKnWg=; b=owGbwMvMwCRo6H6F97bub03G02pJDCn82VU7N/1N411lfehfvLB4krVL/0SrH2edJirY79zee cQnzk6tI5aFQZCJQVZMkeXLNp6j+ysOKXoZ2p6GmcPKBDKEgYtTACbCfIphntbh/s/9rqX1Hese MsW4u2qvalnswTCH7/x8PY/CYPllotcN51dPO+CQaJgKAA== X-Developer-Key: i=gregkh@linuxfoundation.org; a=openpgp; fpr=F4B60CC5BF78C2214A313DCB3147D40DDB2DFB29 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, 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?1760280718968288303?= X-GMAIL-MSGID: =?utf-8?q?1760280718968288303?= The bus_rescan_devices() function was missed in the previous change of the bus_for_each* constant pointer changes, so fix it up now to take a const * to struct bus_type. Cc: "Rafael J. Wysocki" Signed-off-by: Greg Kroah-Hartman --- drivers/base/bus.c | 2 +- include/linux/device/bus.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/base/bus.c b/drivers/base/bus.c index f739a2a79e59..ced61fad390e 100644 --- a/drivers/base/bus.c +++ b/drivers/base/bus.c @@ -769,7 +769,7 @@ static int __must_check bus_rescan_devices_helper(struct device *dev, * attached and rescan it against existing drivers to see if it matches * any by calling device_attach() for the unbound devices. */ -int bus_rescan_devices(struct bus_type *bus) +int bus_rescan_devices(const struct bus_type *bus) { return bus_for_each_dev(bus, NULL, NULL, bus_rescan_devices_helper); } diff --git a/include/linux/device/bus.h b/include/linux/device/bus.h index c30c4748c170..b517b82d4723 100644 --- a/include/linux/device/bus.h +++ b/include/linux/device/bus.h @@ -114,7 +114,7 @@ extern int __must_check bus_register(const struct bus_type *bus); extern void bus_unregister(const struct bus_type *bus); -extern int __must_check bus_rescan_devices(struct bus_type *bus); +extern int __must_check bus_rescan_devices(const struct bus_type *bus); struct bus_attribute { struct attribute attr; From patchwork Mon Mar 13 18:29:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 69017 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1345164wrd; Mon, 13 Mar 2023 11:42:10 -0700 (PDT) X-Google-Smtp-Source: AK7set9lkJXR5ryAJiiLJ/PJgwSueqm/vtO4qV1+sFrtagPKUhfYJxZNioUE9WlSZXBP6e6ifCKp X-Received: by 2002:a17:903:11cf:b0:19e:6b50:e220 with SMTP id q15-20020a17090311cf00b0019e6b50e220mr27944559plh.53.1678732930679; Mon, 13 Mar 2023 11:42:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678732930; cv=none; d=google.com; s=arc-20160816; b=CUdeWodXMmZyMte4GID1baFHYAdYLDARpajg/t9NPUbwUq8OfwGxqgRlEHwIEbUnyU ZS1uJRulSMDABpoR/hL0F68/V2MhJDZlalHZEDwOtlP7R4EaTrQcpH1fSKJ0eapsIrGU 50tekXCSzF3Wkb7QvhRr0cuDfR4qSpjfjC4VdDSZVoS5FGSlEEMH11x2R/jX8G6SBiV2 3/t69CyDyVrV6kwdDLRtTkIrAY81UZcfqrQN7GPb9gTw7LI+X6ADlw0tuPZSNy3bEHtK afiRuRPqKygWJ5i43t8vw6GLjhBvChNlj1C31fP1V4WdDVrcAny0l/08sNrzPgF+HdR+ +TEg== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=eVGzlTvjp85R8e48JdJUIQr3N22FY+9c0FKQBhd2VNc=; b=AsHI8NI4qpMHVX8Kx+AQiTCNl8T989fUBlrZSTtNMgb8irdJb8IXLaXjzI4ejGHyC6 0i9sY7C75zIpmI6fch7VvMhD1Qp1Lsh95ODIKQ//GuRoofnPVP9elkcgr9AC7ZO2sKqZ E4kbsSj2us5nYzYrgDSR4vT/dYo60Nxtwh0UBbAVMW+IRCzRVdWHjExf265iwFtp66Nq AOlg2Y3sEMdzSeWJMgt9UErGhE2srbBcYB+W5xV6sqi+CLsKWyhplgNjpBEwjn/8IU7r 55jkE8VCLuow5iECStLpdoWlVOxNn3YSXnJajLHnmR3krRuHdGQfCNX8wuIN4Ng8y2Hz mluw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=OvPa6zoE; 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 x2-20020a1709027c0200b0019e57f5a5aesi339156pll.567.2023.03.13.11.41.57; Mon, 13 Mar 2023 11:42:10 -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=OvPa6zoE; 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 S231494AbjCMSdz (ORCPT + 99 others); Mon, 13 Mar 2023 14:33:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34542 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230513AbjCMSdV (ORCPT ); Mon, 13 Mar 2023 14:33:21 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A115385B17 for ; Mon, 13 Mar 2023 11:31:52 -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 04F28B811ED for ; Mon, 13 Mar 2023 18:30:45 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5E098C433EF; Mon, 13 Mar 2023 18:30:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1678732243; bh=cRo1e+kQK1rWKnvTCLavWPeNNSm38qrbsMoD6hfrwy8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OvPa6zoEIp0uxqt3Q/zRXqMovt1MsKCzHngAGfnLroaxMCVZL+lAFZJi6s/I7nqQO YuB1obA2s7ufeKSk2Cm3aWer0z941V7U6hrq97jAuAkgUOG1IIn5kMOT/Vv8faltdx nD4CRoKQQBNxNyrZNG/60GKiwWq7iPktegy91y+4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: rafael@kernel.org, Greg Kroah-Hartman Subject: [PATCH 26/36] driver core: bus: constify driver_find() Date: Mon, 13 Mar 2023 19:29:08 +0100 Message-Id: <20230313182918.1312597-26-gregkh@linuxfoundation.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230313182918.1312597-1-gregkh@linuxfoundation.org> References: <20230313182918.1312597-1-gregkh@linuxfoundation.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1534; i=gregkh@linuxfoundation.org; h=from:subject; bh=cRo1e+kQK1rWKnvTCLavWPeNNSm38qrbsMoD6hfrwy8=; b=owGbwMvMwCRo6H6F97bub03G02pJDCn82VVZJt47pb9mc8xXffNrVpT/vt1yFzTcGKw1ZDZVr Uz94rS9I5aFQZCJQVZMkeXLNp6j+ysOKXoZ2p6GmcPKBDKEgYtTACYiOJNhwdqTU5/NVglpSNps Ezl/Zxz/q8Wq/AwLTtX/frjOQ+eLWXu/n4VZhFCZZtEMAA== X-Developer-Key: i=gregkh@linuxfoundation.org; a=openpgp; fpr=F4B60CC5BF78C2214A313DCB3147D40DDB2DFB29 X-Spam-Status: No, score=-7.1 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?1760279061784873787?= X-GMAIL-MSGID: =?utf-8?q?1760279061784873787?= The driver_find() function can now take a const * to bus_type, not just a * so fix that up. Cc: "Rafael J. Wysocki" Signed-off-by: Greg Kroah-Hartman --- drivers/base/bus.c | 2 +- include/linux/device/driver.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/base/bus.c b/drivers/base/bus.c index ced61fad390e..8fea26c22521 100644 --- a/drivers/base/bus.c +++ b/drivers/base/bus.c @@ -1307,7 +1307,7 @@ EXPORT_SYMBOL_GPL(subsys_virtual_register); * from being unregistered or unloaded while the caller is using it. * The caller is responsible for preventing this. */ -struct device_driver *driver_find(const char *name, struct bus_type *bus) +struct device_driver *driver_find(const char *name, const struct bus_type *bus) { struct subsys_private *sp = bus_to_subsys(bus); struct kobject *k; diff --git a/include/linux/device/driver.h b/include/linux/device/driver.h index 50d0a416a5e7..ceb0e477c2c8 100644 --- a/include/linux/device/driver.h +++ b/include/linux/device/driver.h @@ -126,7 +126,7 @@ extern int __must_check driver_register(struct device_driver *drv); extern void driver_unregister(struct device_driver *drv); extern struct device_driver *driver_find(const char *name, - struct bus_type *bus); + const struct bus_type *bus); extern int driver_probe_done(void); extern void wait_for_device_probe(void); void __init wait_for_init_devices_probe(void); From patchwork Mon Mar 13 18:29:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 69060 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1358840wrd; Mon, 13 Mar 2023 12:13:31 -0700 (PDT) X-Google-Smtp-Source: AK7set9C4s/q19G8nFwX3zCAdy3ZvoE6PtgdPFqTI8OU2BAblz27paS/EfnPjrhoutzkxIUVYao6 X-Received: by 2002:a17:90a:e7ca:b0:230:ac12:a5ca with SMTP id kb10-20020a17090ae7ca00b00230ac12a5camr11732807pjb.3.1678734811038; Mon, 13 Mar 2023 12:13:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678734811; cv=none; d=google.com; s=arc-20160816; b=Su2TjnUfFcDDBN0aFwI15DuXs4hHGCjvkDOMFCLefXDN19fuFO9KWNUc7BsOSWJpqX p1nb8VQPnLdQ3I5sFoUUzTBbmqik9YiB4zchJqHYTHTZuN7nI4CuthGFskVuQ/MgmhTa sqzDRAhVc6CsqM3BeW1//QH8YZgS9xCJe9TICtTL0/bb4zofCEie2rXSEcHu0q6A+jIE 05zCGENF9ENJ+PT+oQYXx2YUS5rf1ebTjI74F+0AEcZxt8OVZ+nulp0DG8ef/oHbe9A8 /fDjLyUJeIwJ02g256/WTvJdM4XGl8kPcCTl0qrgDusUith6F1dcRiVrqVjPDBpzXDXB u5vQ== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=8n6i/Gmysti23WfFw1wM37NJ5AZsNQLShwHnt54xufU=; b=D9idnNrc+nuZgru6dt5pGQAdJY0VTkjhfgxzK+KBvwfHqT5eOgtVHxK/cIdf9Lgk0Z JgBiCikmYSGO1Fvt1/O9bNuy1ez/MwLfrarPvMLVdRRf+u4EY/NOgrt1gRiIqhtQgTey y27umk9MIY9WUy/V0bssYehNrA0dhIKVwzflCyb0BjYBdRSTgwwuyuxv8k070c5+Kgt4 zwOFMpo8E9W95Pu7x8zaF5TpMOWmpY9bM0cVBcK/MYMCpfKEt6ryAvDcGU7xPpmq6jct IUvvm8HtWNl5U0KBySuUji1A7Ft6rJTX0jAYC+62vgKrQJa+RPETZX/MFbW0wB44P67x 6btQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=1Js8ii+w; 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 z7-20020a17090ad78700b00236a20ef94bsi437523pju.15.2023.03.13.12.13.15; Mon, 13 Mar 2023 12:13:30 -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=1Js8ii+w; 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 S231506AbjCMSdn (ORCPT + 99 others); Mon, 13 Mar 2023 14:33:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34680 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231361AbjCMSc6 (ORCPT ); Mon, 13 Mar 2023 14:32:58 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7DB8685B16 for ; Mon, 13 Mar 2023 11:31:45 -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 E96FF61476 for ; Mon, 13 Mar 2023 18:30:46 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 06098C433D2; Mon, 13 Mar 2023 18:30:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1678732246; bh=4FnKiW2cwIGqgbis9fEoSgZQpWRB2eH3pM8Glh9uSeA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1Js8ii+wcLI23DREQ97XvJIEvycR9129hf21Ot9bddRs0n00Fqt5IFldEmugvApgz W0yJlgQhNrgPn9SPkyfG6TqhS2b2omjjZtcWEG6T8ugFdaTfTplQ2YjTPnkfmU/ibF qTTnp1gwJ+Xar6dNqQbFzdj276dzV1pJGtes4HFE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: rafael@kernel.org, Greg Kroah-Hartman Subject: [PATCH 27/36] driver core: bus: constify bus_get() Date: Mon, 13 Mar 2023 19:29:09 +0100 Message-Id: <20230313182918.1312597-27-gregkh@linuxfoundation.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230313182918.1312597-1-gregkh@linuxfoundation.org> References: <20230313182918.1312597-1-gregkh@linuxfoundation.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1571; i=gregkh@linuxfoundation.org; h=from:subject; bh=4FnKiW2cwIGqgbis9fEoSgZQpWRB2eH3pM8Glh9uSeA=; b=owGbwMvMwCRo6H6F97bub03G02pJDCn82dWBsWxppo9ylV86me/g9f7oWLbxy3ZVwZ2uce1n+ nc9uvylI5aFQZCJQVZMkeXLNp6j+ysOKXoZ2p6GmcPKBDKEgYtTACayVJRhvkNMwa/iQ+pLLe3r DOd+kGlKOzyximGeqVnNvlr2xCd8UuWRfv+iTVI3XpECAA== X-Developer-Key: i=gregkh@linuxfoundation.org; a=openpgp; fpr=F4B60CC5BF78C2214A313DCB3147D40DDB2DFB29 X-Spam-Status: No, score=-7.1 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?1760281033226522417?= X-GMAIL-MSGID: =?utf-8?q?1760281033226522417?= It's funny to think about getting a reference count of a constant structure pointer, but this locks into place the private data "underneath" the struct bus_type() which is important to not go away while we are working with the bus structure for some callbacks. Cc: "Rafael J. Wysocki" Signed-off-by: Greg Kroah-Hartman --- drivers/base/bus.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/base/bus.c b/drivers/base/bus.c index 8fea26c22521..84a21084d67d 100644 --- a/drivers/base/bus.c +++ b/drivers/base/bus.c @@ -84,7 +84,7 @@ static struct subsys_private *bus_to_subsys(const struct bus_type *bus) return sp; } -static struct bus_type *bus_get(struct bus_type *bus) +static const struct bus_type *bus_get(const struct bus_type *bus) { struct subsys_private *sp = bus_to_subsys(bus); @@ -233,7 +233,7 @@ static const struct kset_uevent_ops bus_uevent_ops = { static ssize_t unbind_store(struct device_driver *drv, const char *buf, size_t count) { - struct bus_type *bus = bus_get(drv->bus); + const struct bus_type *bus = bus_get(drv->bus); struct device *dev; int err = -ENODEV; @@ -256,7 +256,7 @@ static DRIVER_ATTR_IGNORE_LOCKDEP(unbind, 0200, NULL, unbind_store); static ssize_t bind_store(struct device_driver *drv, const char *buf, size_t count) { - struct bus_type *bus = bus_get(drv->bus); + const struct bus_type *bus = bus_get(drv->bus); struct device *dev; int err = -ENODEV; From patchwork Mon Mar 13 18:29:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 69051 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1354437wrd; Mon, 13 Mar 2023 12:04:17 -0700 (PDT) X-Google-Smtp-Source: AK7set+7Cxb8TXDLtbwQprEMhDE/GH9LRAlX1qaIeX9enyld7j8x/lyJ6l+6fpSfy5yKyIydOGAY X-Received: by 2002:aa7:9529:0:b0:623:8592:75c4 with SMTP id c9-20020aa79529000000b00623859275c4mr4584815pfp.29.1678734257582; Mon, 13 Mar 2023 12:04:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678734257; cv=none; d=google.com; s=arc-20160816; b=s8MyIclnHlbRHaFnwO6ilAsbseXP52pE5xsbXq4wSbj1t0EB+ZJbWjYIO9gS5VVy2D YQX/utr7pKGIvtn7R9aKx9fuAeYuyS+UCIRVzcYJMn/VClTKBraH0ybaFReWqOrNg+Ri v2tzR9kUuEE5efOVTE0t9YdxF13wfIcpQixU449ZUwhy6LVlxEAU8uFjjIYfHSvNOG2E 8leeAPOgTQAUUEdJ+rZdLGQjigeFIQAP5HMqur0704xQpCgOglU7F5r91gz1GJmy+BnI XnElR2rrD4Arz6cErO9+2M010LUrbzPzvjlqW1Wc2UMi6xSp+4Ybban6UgcoTGo9+JEa Nm2A== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=CEhapoBdU9PSxbAFYfqYaUsysVlsakvzO4ueoFhj5RE=; b=BvzuFoYqxUc6hxOxEt0jxiajQFyrTU/PoBiooK8FfL03Oj1vJwG/fwiEhzNMX+6M9o rA7ilrknrgcG5Be3/P+PGqNtOzuvwvTOIxV4p9JmpnHOQdRFchNPjeu8Jc885QOMZ3nH wi3B42hg1C0D27ji9MQjFoMx2/nLT+z4T2SStoQddxiY+mhrL7jJM+vquGsMIPuDAPdy hARtxFZcLe+7RrtS5spY+Th5nZ+U1Eac2D11PjorhWpqXTs3Y38N169eRAkBcNXpjd2s 5bMTJEiVnqPnj6HDp2L2pO/hgzcW7zL0iVjIeZbdrC7aIA0QRC3QzZ8UDQRuLhfeCltO XMCw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=wifLC8Sv; 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 f10-20020a6547ca000000b005090185ad64si138908pgs.879.2023.03.13.12.04.04; Mon, 13 Mar 2023 12:04:17 -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=wifLC8Sv; 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 S231435AbjCMScj (ORCPT + 99 others); Mon, 13 Mar 2023 14:32:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34576 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231139AbjCMScB (ORCPT ); Mon, 13 Mar 2023 14:32:01 -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 9A24884F6C for ; Mon, 13 Mar 2023 11:31: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 dfw.source.kernel.org (Postfix) with ESMTPS id 8511F61465 for ; Mon, 13 Mar 2023 18:30:49 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 95DEAC433D2; Mon, 13 Mar 2023 18:30:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1678732248; bh=XOt986J4P1SQsjKxI3G691EIKx8QyqtjbVGtFAmvj24=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=wifLC8SvUOVTXRkE2sazX5gOlQwZKubUUINw5E59fDDwyHo6YWaKKTDr+o/iQ0Yv+ y5Ky/4JEL7u4QSKsf1uaC1ABb9A3ud6QeLQU7OmK8kHI4kriupcyR9zNqmxluCpY5H tL3cY2TnPPuNqkMXdAVAtjwcrEay3o+R/7MolWOE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: rafael@kernel.org, Greg Kroah-Hartman Subject: [PATCH 28/36] driver core: make the bus_type in struct device_driver constant Date: Mon, 13 Mar 2023 19:29:10 +0100 Message-Id: <20230313182918.1312597-28-gregkh@linuxfoundation.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230313182918.1312597-1-gregkh@linuxfoundation.org> References: <20230313182918.1312597-1-gregkh@linuxfoundation.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=955; i=gregkh@linuxfoundation.org; h=from:subject; bh=XOt986J4P1SQsjKxI3G691EIKx8QyqtjbVGtFAmvj24=; b=owGbwMvMwCRo6H6F97bub03G02pJDCn82dVsb5yWXN3845t6n23hxESxrAv+2Y6Vqm+T523e2 HX1hHFIRywLgyATg6yYIsuXbTxH91ccUvQytD0NM4eVCWQIAxenAExE/DvDgoOa7Jr/3y7ssZdz dlqwv2DDHiWh2wwLNpipTHS8q85SmFS26oG8uac8t0gKAA== X-Developer-Key: i=gregkh@linuxfoundation.org; a=openpgp; fpr=F4B60CC5BF78C2214A313DCB3147D40DDB2DFB29 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, 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?1760280452507210402?= X-GMAIL-MSGID: =?utf-8?q?1760280452507210402?= The pointer to struct bus_type in struct device_driver should only be pointing to something that can never change now that the driver core has fixed up the previously writable fields. So mark it as a constant pointer to enforce this and move forward with the goal of moving bus_type into read-only memory. Cc: "Rafael J. Wysocki" Signed-off-by: Greg Kroah-Hartman --- include/linux/device/driver.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/device/driver.h b/include/linux/device/driver.h index ceb0e477c2c8..0f22a6f46f8c 100644 --- a/include/linux/device/driver.h +++ b/include/linux/device/driver.h @@ -95,7 +95,7 @@ enum probe_type { */ struct device_driver { const char *name; - struct bus_type *bus; + const struct bus_type *bus; struct module *owner; const char *mod_name; /* used for built-in modules */ From patchwork Mon Mar 13 18:29:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 69058 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1357727wrd; Mon, 13 Mar 2023 12:11:07 -0700 (PDT) X-Google-Smtp-Source: AK7set+M1kNIFXexr0Ye9nEELnWKfO7xfEytbNT/jjePpxf6V92MIuQA6BP1FPseIvpT0SyraUxZ X-Received: by 2002:a17:90a:af8a:b0:23d:1f5d:7181 with SMTP id w10-20020a17090aaf8a00b0023d1f5d7181mr2151120pjq.7.1678734667058; Mon, 13 Mar 2023 12:11:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678734667; cv=none; d=google.com; s=arc-20160816; b=POYzrdTspfVa9nTkvQmPvbU4lnxIkaQC70yo2QOE3aALyNfeuhiI8n1SOtXxqI/y3f x0JlgI/5wOAl4EjgGy6hldv+G1gNQbdWYFr4e3vUOnjldtqV2dSX5XXzuosHfFvjiw4R 2jGOMzf68dorXM3sWYhwnjUohPHTe4Qm+LK1Fm87ULWQZWcapDrC0WDrVxYRmnpup37m mFJlmx6b1pKRDTxUwizPFLsGdc64JuJ23lXT9lzWNo+8R3Ez+j/3DO2bPSMGCbpsojwc 8u1bB1+ScXhegE0wRqsnyPB3k1d+wifpkVHt2ZWh8+B0kE3YRDjq6mNALAYUZRgBuslS YFdA== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=kbUFaHpIM9F0miqwKycD2m2tCW1g0TECf9f9DSp/btE=; b=1EWQFKe7yugSPsq8XPX3w3DW9VQDMhwnzkUMGKmeuOjIOqjhDmT4B6/EReNVvyvKN4 qDUzjZqDEUp3OR/ELlVxp9Jc4PYaDTldJfZuyj5wEFbQ1PNtfdQr3N3c1gbc3RDKuLPu E0gSkSlraDzK3V/VaMgu/f2K42Y8+1Dz+UELd2fkGFCK88g0evUrltayJaYnN6DU9pQo lOnwXdlDtiDhpjft3z8y1YRAYZqFMrx6Y62Bii+zYlljN7BGTLlsT9qvzawamHKW5PcC rHDb6Nq58/G4WbI2IhNUYTlahYpGzidk69hkDhBqGgMilopmgi8vU9SUhHP/wAHn5aoX TLfw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=2SJ8103H; 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 o3-20020a17090a0a0300b00233cf305f6bsi398141pjo.111.2023.03.13.12.10.54; Mon, 13 Mar 2023 12:11:07 -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=2SJ8103H; 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 S231441AbjCMScm (ORCPT + 99 others); Mon, 13 Mar 2023 14:32:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34610 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231164AbjCMScD (ORCPT ); Mon, 13 Mar 2023 14:32:03 -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 DF97280E2C; Mon, 13 Mar 2023 11:31:11 -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 28AB661365; Mon, 13 Mar 2023 18:30:52 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 38018C433D2; Mon, 13 Mar 2023 18:30:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1678732251; bh=akchBNDul5kGQ4bbsIzqd3Wkn40724BLCL8j8t0kerc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=2SJ8103HKr4PjUlRjoNwdWxY4QSChA0Dk/7hva88/LA8GHYXMB8IgF/YEsYBqr+vs gCkkVmofymj5bAKAEru2Vmoo+ZVILdNd8f3XVaOVgXwXnz+xAa9cj9TGJ1FMgAsRq8 fwX+Gz8OgKIeU7d53oSMYt7MCRVpkyQGNP0GlA7Q= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: rafael@kernel.org, Greg Kroah-Hartman , Weili Qian , Zhou Wang , Herbert Xu , "David S. Miller" , linux-crypto@vger.kernel.org Subject: [PATCH 29/36] crypto: hisilicon/qm - make struct bus_type * const Date: Mon, 13 Mar 2023 19:29:11 +0100 Message-Id: <20230313182918.1312597-29-gregkh@linuxfoundation.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230313182918.1312597-1-gregkh@linuxfoundation.org> References: <20230313182918.1312597-1-gregkh@linuxfoundation.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1534; i=gregkh@linuxfoundation.org; h=from:subject; bh=akchBNDul5kGQ4bbsIzqd3Wkn40724BLCL8j8t0kerc=; b=owGbwMvMwCRo6H6F97bub03G02pJDCn82dXSruqi1/y0HkotvSXhxmX3ft6cbz25eoLbzpoxH 69heZrYEcvCIMjEICumyPJlG8/R/RWHFL0MbU/DzGFlAhnCwMUpABNR280wz/zjnVbzmU4HznI9 bXQ9/edf9BXehwwL1gstPiSTGlNWepzxOtuTnxffXLDbDAA= X-Developer-Key: i=gregkh@linuxfoundation.org; a=openpgp; fpr=F4B60CC5BF78C2214A313DCB3147D40DDB2DFB29 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, 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?1760280882242760400?= X-GMAIL-MSGID: =?utf-8?q?1760280882242760400?= In the function, qm_get_qos_value(), a struct bus_type * is used, but it really should be a const pointer as it is not modified anywhere in the function, and the driver core function it is used in expects a constant pointer. Cc: Weili Qian Cc: Zhou Wang Cc: Herbert Xu Cc: "David S. Miller" Cc: linux-crypto@vger.kernel.org Signed-off-by: Greg Kroah-Hartman Acked-by: Herbert Xu --- Note, this is a patch that is a prepatory cleanup as part of a larger series of patches that is working on resolving some old driver core design mistakes. It will build and apply cleanly on top of 6.3-rc2 on its own, but I'd prefer if I could take it through my driver-core tree so that the driver core changes can be taken through there for 6.4-rc1. drivers/crypto/hisilicon/qm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/crypto/hisilicon/qm.c b/drivers/crypto/hisilicon/qm.c index e4c84433a88a..fd1a38ee55f8 100644 --- a/drivers/crypto/hisilicon/qm.c +++ b/drivers/crypto/hisilicon/qm.c @@ -3691,7 +3691,7 @@ static ssize_t qm_get_qos_value(struct hisi_qm *qm, const char *buf, unsigned long *val, unsigned int *fun_index) { - struct bus_type *bus_type = qm->pdev->dev.bus; + const struct bus_type *bus_type = qm->pdev->dev.bus; char tbuf_bdf[QM_DBG_READ_LEN] = {0}; char val_buf[QM_DBG_READ_LEN] = {0}; struct pci_dev *pdev; From patchwork Mon Mar 13 18:29:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 69024 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1346467wrd; Mon, 13 Mar 2023 11:45:22 -0700 (PDT) X-Google-Smtp-Source: AK7set8zmzzw+iYerO6evyCVWLJZh19rcV0nQrT25n+Aua0FM4FNzwAB0ESqtjVbvOqWMYKS2Pvl X-Received: by 2002:a17:903:187:b0:19c:be57:9c82 with SMTP id z7-20020a170903018700b0019cbe579c82mr44115816plg.65.1678733122019; Mon, 13 Mar 2023 11:45:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678733122; cv=none; d=google.com; s=arc-20160816; b=SDLzxgK/bAZOHM3JMyqrHQ5UUD+iBrV2qXl8nj0fxjnveQdINXA+t3ELP26/2FX1ux wKs3zaHrx83YdWVkfP+mhYhWFTdlyEtRTSbFG4AOapg+fWH7Q1ODvnAX8XnwJwrKmUc4 AllI8F0pPhFyAHJts+rOlp+BI3tJLT+53M79vF+wQrERo5wkeifjCuTXEHEgB7MaopKy MSiV2PORR397TMJ5VdUqPbWFXS908NAa7NRIDCjnylPeQpty/dxbcMx88MWr9HQ6lS+v jgSJJGqdg4/m13eoJHi03NuGcd4C6rAoMU/UcMJWU7Jx2DWcb+ws8uKjoZQ8ieFKfRT7 9wSw== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=kEuVJUxLPOYo07D49rvUsSVXzQyu6pEDO+uVoOTyksA=; b=QlUpCEV7HnVKnnBUoqws0IyDyKYEVVV8ThTJD1YS8wuqFIpfjiDiqQbu6xz7T/ahP1 PWD8e24YaaZcP8GFv2TI4SvljQUoPx9uv8r7Dmfx9CXmRauf34jCXrwxm2cNlNvc32Fs 3C8W2Vo31pmlJg+iQ/ERd2/AOJB5E1VIeSPldxs0W1FwkgErRWMgr+wl03GNsgQnKu7k u81b6mdoSHhZoYUbz6K3BKSD45Vq+IbB3YkzceG0o/44GnTehyXEWf7Df7YW6RXWRwgb j2eAptKz0klpMuEoqxJyYpV5+LgDf4/T6PZzBlXBe0b6U4tG0zGKTeK7XNY4JGYzb69e VvJw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=0FMXy6Kn; 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 bj7-20020a170902850700b001a05d77ca66si364352plb.501.2023.03.13.11.45.09; Mon, 13 Mar 2023 11:45:21 -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=0FMXy6Kn; 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 S230265AbjCMScX (ORCPT + 99 others); Mon, 13 Mar 2023 14:32:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35202 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231349AbjCMSbe (ORCPT ); Mon, 13 Mar 2023 14:31:34 -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 C643280932 for ; Mon, 13 Mar 2023 11:30: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 ams.source.kernel.org (Postfix) with ESMTPS id 67CA9B811E0 for ; Mon, 13 Mar 2023 18:30:55 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A1439C433D2; Mon, 13 Mar 2023 18:30:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1678732254; bh=xXfHOtpB42Nc5WnZyQQpmBHFWLUExBdm6jawq0Jm084=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0FMXy6Knts0+zZgypoJ0GS2NVaLO5tLbDYgKvXx7LMo+bv1jhAWytcutb/BiI1vmD yBEXUeCTIezUvb7qFu7X1zL/BBLS5n8X+R2ydR39/TuRmUuIlR6blTMiIf1xBYy5xQ 19+sdyeK0HrYZKr/HzYzLfOdhn58D730PvNR5Cdo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: rafael@kernel.org, Greg Kroah-Hartman , Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Tvrtko Ursulin , David Airlie , Daniel Vetter , Daniele Ceraolo Spurio , Alan Previn , John Harrison , Tony Ye , Vitaly Lubart , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH 30/36] drm/i915/huc: use const struct bus_type pointers Date: Mon, 13 Mar 2023 19:29:12 +0100 Message-Id: <20230313182918.1312597-30-gregkh@linuxfoundation.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230313182918.1312597-1-gregkh@linuxfoundation.org> References: <20230313182918.1312597-1-gregkh@linuxfoundation.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=3256; i=gregkh@linuxfoundation.org; h=from:subject; bh=xXfHOtpB42Nc5WnZyQQpmBHFWLUExBdm6jawq0Jm084=; b=owGbwMvMwCRo6H6F97bub03G02pJDCn82dUOV8LkZs1rW1FbEZ2+du0D7wfbfUpebF2pHn7h+ 5lpjir1HbEsDIJMDLJiiixftvEc3V9xSNHL0PY0zBxWJpAhDFycAjARsTcM82y+VjUWN7TzOscl xYtl2WzK7ZLcwbDg8GWOaEHppcYb97/63/6QcaXxlcd/AA== X-Developer-Key: i=gregkh@linuxfoundation.org; a=openpgp; fpr=F4B60CC5BF78C2214A313DCB3147D40DDB2DFB29 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, 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?1760279261982943417?= X-GMAIL-MSGID: =?utf-8?q?1760279261982943417?= The struct bus_type pointers in the functions intel_huc_register_gsc_notifier() and intel_huc_unregister_gsc_notifier() should be a const pointer, as the structure is not modified anywhere in the functions, and the pointer they are passed will be a const * in the near future. Cc: Jani Nikula Cc: Joonas Lahtinen Cc: Rodrigo Vivi Cc: Tvrtko Ursulin Cc: David Airlie Cc: Daniel Vetter Cc: Daniele Ceraolo Spurio Cc: Alan Previn Cc: John Harrison Cc: Greg Kroah-Hartman Cc: Tony Ye Cc: Vitaly Lubart Cc: intel-gfx@lists.freedesktop.org Cc: dri-devel@lists.freedesktop.org Signed-off-by: Greg Kroah-Hartman Acked-by: Tvrtko Ursulin --- Note, this is a patch that is a prepatory cleanup as part of a larger series of patches that is working on resolving some old driver core design mistakes. It will build and apply cleanly on top of 6.3-rc2 on its own, but I'd prefer if I could take it through my driver-core tree so that the driver core changes can be taken through there for 6.4-rc1. drivers/gpu/drm/i915/gt/uc/intel_huc.c | 4 ++-- drivers/gpu/drm/i915/gt/uc/intel_huc.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc.c b/drivers/gpu/drm/i915/gt/uc/intel_huc.c index 410905da8e97..8b453bd7c953 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_huc.c +++ b/drivers/gpu/drm/i915/gt/uc/intel_huc.c @@ -183,7 +183,7 @@ static int gsc_notifier(struct notifier_block *nb, unsigned long action, void *d return 0; } -void intel_huc_register_gsc_notifier(struct intel_huc *huc, struct bus_type *bus) +void intel_huc_register_gsc_notifier(struct intel_huc *huc, const struct bus_type *bus) { int ret; @@ -200,7 +200,7 @@ void intel_huc_register_gsc_notifier(struct intel_huc *huc, struct bus_type *bus } } -void intel_huc_unregister_gsc_notifier(struct intel_huc *huc, struct bus_type *bus) +void intel_huc_unregister_gsc_notifier(struct intel_huc *huc, const struct bus_type *bus) { if (!huc->delayed_load.nb.notifier_call) return; diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc.h b/drivers/gpu/drm/i915/gt/uc/intel_huc.h index 52db03620c60..05d4832f8461 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_huc.h +++ b/drivers/gpu/drm/i915/gt/uc/intel_huc.h @@ -51,8 +51,8 @@ int intel_huc_check_status(struct intel_huc *huc); void intel_huc_update_auth_status(struct intel_huc *huc); bool intel_huc_is_authenticated(struct intel_huc *huc); -void intel_huc_register_gsc_notifier(struct intel_huc *huc, struct bus_type *bus); -void intel_huc_unregister_gsc_notifier(struct intel_huc *huc, struct bus_type *bus); +void intel_huc_register_gsc_notifier(struct intel_huc *huc, const struct bus_type *bus); +void intel_huc_unregister_gsc_notifier(struct intel_huc *huc, const struct bus_type *bus); static inline int intel_huc_sanitize(struct intel_huc *huc) { From patchwork Mon Mar 13 18:29:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 69057 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1356621wrd; Mon, 13 Mar 2023 12:08:59 -0700 (PDT) X-Google-Smtp-Source: AK7set9LZOj6pAxkmVI37Nd1Euj5sIpV0nZePR516eBnVzfr8j+CmVMePuFY2QpPa2i+N6iSltLF X-Received: by 2002:a62:53c3:0:b0:5d7:637a:abcf with SMTP id h186-20020a6253c3000000b005d7637aabcfmr29247970pfb.32.1678734539418; Mon, 13 Mar 2023 12:08:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678734539; cv=none; d=google.com; s=arc-20160816; b=BALBVVYDd0IJMzuJgS2kwl0VA2PFq7qRqjIFDN85ENVrxec8b3Re+2oDXhz52eJAFS YRNjgi7Kkzn/3HyQ3gjGMyxsx23X6lsZSyd99NgPfKbrBKKpaNlzPhke8Zv+Q5C3LDra CGVbPoMX0mMeCxSSt/PcV/8MGsc/lEPdcSDllEpqCcuvjIdicpzw3vMzZXijCRRH9opP 1kSlGGfPhSyZTGPxuUM6UTugZCHgjjBI8cdn4pIB9YBNiuow2dCMSta4UJ6LLkDx89cG 4NepBPMaqQh1zS/phGrhe1yF1+7g//eN9efF9zZqbnguDxOe+3kMWXTQ0rWRcitDhkyM JZrQ== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=ErEkV2Eb9iPBaFuFM03Sag12i1Y0KFcL4FquR+/+4+o=; b=dU3ox76mlYGw+VNdchrhPAEW5GpqwJ33vNDlrFWVGHm14BpJV+uGtqXYSzDnOqPfKh dNDZzxKcLKI/qxDWLVBSceegaM3edi859OfaO4Zl50QraXbqjHXxDW6X3A9gCHPtY4pu efvUMog10AZY1uD5sSqV+og0DSEqQPOG+TZqqkNPnC7umtVSnaSc2iPQKni2JlSEnLbX iNhfFobQ2irSKkMQ9h/W/s4jvb/0boqwzUOgMncwGUEG0nMnsdSMY8jZW+xF03jHO2BN dRdVgIO4DBpAWzCbx/xf1Fan6KOSN9vPj81xfZgxzatIJuIfaiVf74m4+tmuYzjKtyBj 5sQw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="h/hI9tL/"; 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 m3-20020a632603000000b004f0131105e9si155853pgm.855.2023.03.13.12.08.46; Mon, 13 Mar 2023 12:08:59 -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="h/hI9tL/"; 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 S231524AbjCMSdu (ORCPT + 99 others); Mon, 13 Mar 2023 14:33:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34008 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231489AbjCMSdT (ORCPT ); Mon, 13 Mar 2023 14:33:19 -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 0FF9E85B21; Mon, 13 Mar 2023 11:31:48 -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 60BC661484; Mon, 13 Mar 2023 18:30:57 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6FA3AC433EF; Mon, 13 Mar 2023 18:30:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1678732256; bh=sdMhGh/v0S4uLhhMgXoZcxTftjLcVbQ0JldvEDTZ1yE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=h/hI9tL/g1oKZX9SamcN3M5/Phk2olRLoatPJFm31YFAUcAsHgxSUO3k5HrcUFBGR oTFlhpdu5AzaDPUsg8JPv2FLzqxqaON2iQZQPmb/f7IuSBmUXQAln9+7wnXBsgdkfo ujvYCBIj/MpDkfXQafdJ925ZIXxw9Js6vvSnB+k8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: rafael@kernel.org, Greg Kroah-Hartman , "Michael S. Tsirkin" , Jason Wang , kvm@vger.kernel.org, virtualization@lists.linux-foundation.org, netdev@vger.kernel.org Subject: [PATCH 31/36] vhost-vdpa: vhost_vdpa_alloc_domain() should be using a const struct bus_type * Date: Mon, 13 Mar 2023 19:29:13 +0100 Message-Id: <20230313182918.1312597-31-gregkh@linuxfoundation.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230313182918.1312597-1-gregkh@linuxfoundation.org> References: <20230313182918.1312597-1-gregkh@linuxfoundation.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1408; i=gregkh@linuxfoundation.org; h=from:subject; bh=sdMhGh/v0S4uLhhMgXoZcxTftjLcVbQ0JldvEDTZ1yE=; b=owGbwMvMwCRo6H6F97bub03G02pJDCn82TUvbDoStjD0i/1v+vmN+6FAU3bEc8GDO0VEeJmnK n3uEcvoiGVhEGRikBVTZPmyjefo/opDil6Gtqdh5rAygQxh4OIUgIlE/mOYp+sx9Tebv8y3yUbr ta71fL9koRnIzzDfQ/VD509tq8Db9tk3zRNct9fM6dcHAA== X-Developer-Key: i=gregkh@linuxfoundation.org; a=openpgp; fpr=F4B60CC5BF78C2214A313DCB3147D40DDB2DFB29 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, 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?1760280748572806804?= X-GMAIL-MSGID: =?utf-8?q?1760280748572806804?= The function, vhost_vdpa_alloc_domain(), has a pointer to a struct bus_type, but it should be constant as the function it passes it to expects it to be const, and the vhost code does not modify it in any way. Cc: "Michael S. Tsirkin" Cc: Jason Wang Cc: kvm@vger.kernel.org Cc: virtualization@lists.linux-foundation.org Cc: netdev@vger.kernel.org Signed-off-by: Greg Kroah-Hartman --- Note, this is a patch that is a prepatory cleanup as part of a larger series of patches that is working on resolving some old driver core design mistakes. It will build and apply cleanly on top of 6.3-rc2 on its own, but I'd prefer if I could take it through my driver-core tree so that the driver core changes can be taken through there for 6.4-rc1. drivers/vhost/vdpa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/vhost/vdpa.c b/drivers/vhost/vdpa.c index dc12dbd5b43b..08c7cb3399fc 100644 --- a/drivers/vhost/vdpa.c +++ b/drivers/vhost/vdpa.c @@ -1140,7 +1140,7 @@ static int vhost_vdpa_alloc_domain(struct vhost_vdpa *v) struct vdpa_device *vdpa = v->vdpa; const struct vdpa_config_ops *ops = vdpa->config; struct device *dma_dev = vdpa_get_dma_dev(vdpa); - struct bus_type *bus; + const struct bus_type *bus; int ret; /* Device want to do DMA by itself */ From patchwork Mon Mar 13 18:29:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 69054 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1356297wrd; Mon, 13 Mar 2023 12:08:17 -0700 (PDT) X-Google-Smtp-Source: AK7set+XKSMVF1g0EcN0jMd74E2GPWd1X/zZRL93dIRg7O2KY3dx0vhwD6HKaSDHYsDyfoOvMkgF X-Received: by 2002:a17:90a:310:b0:237:9fbd:31c8 with SMTP id 16-20020a17090a031000b002379fbd31c8mr36195138pje.15.1678734497466; Mon, 13 Mar 2023 12:08:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678734497; cv=none; d=google.com; s=arc-20160816; b=NR2cJlTZiUEGFHoGQrtb24St606sDTxsSI3Sz+dMLxbU4WXNu+BSdztvh9Qfktn/Aw iQFesQSAPH5df6cRLhgPIV8afENSmgVt0bE53vMeiAjV9Ro3262DIDaG7g7bmrAa8yYY 11EOrcU3SFee2JopL5pfVKYqNriZ+LliX0tG1glbPNnvi5K+vOUATl2WkoEGL2nNrlT2 bfSjpMbbn1Z8vR9bAMdGOO82bY21dGdIT+BWWZ2Df1krvCZHsvWh92BaMnDAqsP/fsRt JORJ33m0pdITGBF9sAg0E91A3pJQZ58zOyJw6vExGAg0AKQ/frmzZuS0x32eIGSlyNXG jXKA== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=nR8gdlA0yZfAbwQrHTsFCTmyhXF2kRyaBpFWAsQfow0=; b=nwhP/0O4AeGrAq3ZXvcqC8kX2LJ1YaujUcP0mZ4wQ5rH9ggM+Xb0orDHJ8bd8jyYJG HOfp+o+UyUr7qHCgtTyPXGuPyitBBI6VKnH7r4uh3PKBsL0SSTpCuzE3KuDMZ5SyESCm NDCwQBETNLZUV8ZWaawMWN7yNQ5wCB6ncjD6S+K+TaXf69bQQlfX1tzCDvRgwKWvIK/N I1WA4lo+e7ajNHxp1gIFemhLx1ll8hkceGF0NtQrx2Sql9n8SuOc+zi7ONJi8CaObboD 3YxiCO4oRAsKQf/Ze3D5LERe/e8lKTTPna6mb6ejPEju0/kg7woy2ehBNsK723EokaU6 fDQA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=JZuW8D0A; 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 m68-20020a632647000000b005089640a405si171121pgm.752.2023.03.13.12.08.04; Mon, 13 Mar 2023 12:08:17 -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=JZuW8D0A; 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 S231467AbjCMSh7 (ORCPT + 99 others); Mon, 13 Mar 2023 14:37:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45422 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231405AbjCMShp (ORCPT ); Mon, 13 Mar 2023 14:37:45 -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 9F910222D7; Mon, 13 Mar 2023 11:36:48 -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 0E54C61464; Mon, 13 Mar 2023 18:30:26 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2405FC433EF; Mon, 13 Mar 2023 18:30:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1678732225; bh=/YljSSK5bkf0A5p++gDOQhTrbvu0meKM3gc6Wqmpcik=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JZuW8D0A6kYVqF6udIwRPFUbDNKarWp+aG9MdmZAfzvfwL091bU1pRVD06iPU9yQi 69T46Gdn3EtJ1MbLsLah0P0CImxbvPkAnq4/WJz2qjfGZpM/Az5Srox+oono4i3H1L KmNOk7uMQNXhIE3GwY9xte0Bf17QPPPE595IrL1E= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: rafael@kernel.org, Greg Kroah-Hartman , Fenghua Yu , Dave Jiang , Vinod Koul , dmaengine@vger.kernel.org Subject: [PATCH 32/36] dmaengine: idxd: use const struct bus_type * Date: Mon, 13 Mar 2023 19:29:14 +0100 Message-Id: <20230313182918.1312597-32-gregkh@linuxfoundation.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230313182918.1312597-1-gregkh@linuxfoundation.org> References: <20230313182918.1312597-1-gregkh@linuxfoundation.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1736; i=gregkh@linuxfoundation.org; h=from:subject; bh=/YljSSK5bkf0A5p++gDOQhTrbvu0meKM3gc6Wqmpcik=; b=owGbwMvMwCRo6H6F97bub03G02pJDCn82TX6kZ/vWz5Tste57XYkInulvW3Dsd+vJbdo3OIIn n2O58rajlgWBkEmBlkxRZYv23iO7q84pOhlaHsaZg4rE8gQBi5OAZiIaBHD/MAFhiy3Q9NCqiem r3q4bjJbgra+CcM8JY6ke5Pcy60cy4N917PKMUi/nqYGAA== X-Developer-Key: i=gregkh@linuxfoundation.org; a=openpgp; fpr=F4B60CC5BF78C2214A313DCB3147D40DDB2DFB29 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, 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?1760280704399548831?= X-GMAIL-MSGID: =?utf-8?q?1760280704399548831?= In the functions unbind_store() and bind_store(), a struct bus_type * should be a const one, as the driver core bus functions used by this variable are expecting the pointer to be constant, and these functions do not modify the pointer at all. Cc: Fenghua Yu Cc: Dave Jiang Cc: Vinod Koul Cc: dmaengine@vger.kernel.org Signed-off-by: Greg Kroah-Hartman Acked-by: Fenghua Yu Acked-by: Vinod Koul Acked-by: Dave Jiang --- Note, this is a patch that is a prepatory cleanup as part of a larger series of patches that is working on resolving some old driver core design mistakes. It will build and apply cleanly on top of 6.3-rc2 on its own, but I'd prefer if I could take it through my driver-core tree so that the driver core changes can be taken through there for 6.4-rc1. drivers/dma/idxd/compat.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/dma/idxd/compat.c b/drivers/dma/idxd/compat.c index 3df21615f888..5fd38d1b9d28 100644 --- a/drivers/dma/idxd/compat.c +++ b/drivers/dma/idxd/compat.c @@ -16,7 +16,7 @@ extern void device_driver_detach(struct device *dev); static ssize_t unbind_store(struct device_driver *drv, const char *buf, size_t count) { - struct bus_type *bus = drv->bus; + const struct bus_type *bus = drv->bus; struct device *dev; int rc = -ENODEV; @@ -32,7 +32,7 @@ static DRIVER_ATTR_IGNORE_LOCKDEP(unbind, 0200, NULL, unbind_store); static ssize_t bind_store(struct device_driver *drv, const char *buf, size_t count) { - struct bus_type *bus = drv->bus; + const struct bus_type *bus = drv->bus; struct device *dev; struct device_driver *alt_drv = NULL; int rc = -ENODEV; From patchwork Mon Mar 13 18:29:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 69043 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1348254wrd; Mon, 13 Mar 2023 11:49:56 -0700 (PDT) X-Google-Smtp-Source: AK7set93rQwoXZJcdhWd0hHs441vT+SFUQyHK/kUkdQ5hlCn5q6uaHQo04SLIrcC16IKDTogUM0J X-Received: by 2002:a17:903:24f:b0:19e:bad3:4c6 with SMTP id j15-20020a170903024f00b0019ebad304c6mr31183082plh.58.1678733396081; Mon, 13 Mar 2023 11:49:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678733396; cv=none; d=google.com; s=arc-20160816; b=gpHmjEHjoEuH4wj7tLA2AEE1vm4aoEbfLFBU/lkgqLcY/OdI7CI9VZRrJ7BLbLktGl SNxRcqcBPPY6ZSlJsZiDWJxr/GaklJ+Wr9iQ6gVXo+NBSQ2LlAZkvHZw3uFTehe5kYt/ BO7vGGaVJxr6xX2h3s1zXx7VVoPBki8fbLH1EIcDJbrjAQOuw+nHv/gW7B1Q2UqsdoRt y2Dl75PCNzt5GJeownB/WDOYBb/BrXJHtcAJqypJyjgZu67X2CNEu/ddMvoZr83tX/Oe QN8npfeQGjF27ZwFi5V6e5BfBfPBOE/3o0LZkZdo9WLF3qlGfQpV2mbtQPc8z6wb3eq8 iQiA== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Tmzw0igUK1cXyf7nSqUHsKjUO9Tzj4o5GykoGgI1zKc=; b=PGl6QqxhWPpxnh1qCBTFhaj5r9a9qzQ2xa7RF92duwn24QZTiGMCKDE9ikRo1J+2fU BdpJzCmFPphrmfdTEkNNbU27hSyOFndrTvS2SRe6mtxs3bdNXeJVojKJMceDTquQsxQG +JawhpDgz3AR+7BLaHtNJP8bmWLoIZlvnWts4P07mtdunxfehF8B8SF8Blv74LDe+lfq 5YbQ7hI0lErjnAs8Qx/VMNT1vfcYGbjFu0Oto0VhVAtx7HuSgrDcv9AgrZCK6EFQzfjT xC9jLVbsmmfEjDgsAAxaw4Vu3l+VRAwM73WwVSrJW3CXNUZHGUK/o5cd1JGRF7GxjXNC g+QQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="rH/MCVbK"; 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 p17-20020a631e51000000b0050b026c3aa7si172740pgm.395.2023.03.13.11.49.42; Mon, 13 Mar 2023 11:49:56 -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="rH/MCVbK"; 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 S231495AbjCMSd1 (ORCPT + 99 others); Mon, 13 Mar 2023 14:33:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35180 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231395AbjCMScx (ORCPT ); Mon, 13 Mar 2023 14:32:53 -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 32C1185A74 for ; Mon, 13 Mar 2023 11:31:37 -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 5E935B811E1 for ; Mon, 13 Mar 2023 18:30:29 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 87D2DC433D2; Mon, 13 Mar 2023 18:30:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1678732228; bh=W+fW+GaLv1eYNbTlx2ySkmSxwEEfYBzIfMGA/H1zPac=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rH/MCVbKSXu9ot3ZQ0Qy8B3weUd+cMfiNd0Tmf9+3da7IYDJNklPKProJ1v1Hp6WB oTJ+yPGFMqYDf25wAci03yskwsNdoU12pXS+OtmycZlMddHniV/OAqY8K5m1R2sbcp chEJjO9zT56BA6c5+okDz5S8DIBXllCgBtYpNxoM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: rafael@kernel.org, Greg Kroah-Hartman , Russell King , "Russell King (Oracle)" , Arnd Bergmann , Robin Murphy , Kees Cook , Lukas Bulwahn , Ben Dooks , Linus Walleij , linux-arm-kernel@lists.infradead.org Subject: [PATCH 33/36] ARM/dma-mapping: const a pointer to bus_type in arm_iommu_create_mapping() Date: Mon, 13 Mar 2023 19:29:15 +0100 Message-Id: <20230313182918.1312597-33-gregkh@linuxfoundation.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230313182918.1312597-1-gregkh@linuxfoundation.org> References: <20230313182918.1312597-1-gregkh@linuxfoundation.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2362; i=gregkh@linuxfoundation.org; h=from:subject; bh=W+fW+GaLv1eYNbTlx2ySkmSxwEEfYBzIfMGA/H1zPac=; b=owGbwMvMwCRo6H6F97bub03G02pJDCn82TU3trW/t7ZIa3j9d6Ou1M5F3ae72GSnzUrU3HmRK 3GXUfe+jlgWBkEmBlkxRZYv23iO7q84pOhlaHsaZg4rE8gQBi5OAZiI1x2GuXI1bIVf36jYLPaR Ll9VPzW5lZH5C8Ncif69Fy9pTj3HEPb9xfo4wS2hf/ijAQ== X-Developer-Key: i=gregkh@linuxfoundation.org; a=openpgp; fpr=F4B60CC5BF78C2214A313DCB3147D40DDB2DFB29 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, 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?1760279549617188128?= X-GMAIL-MSGID: =?utf-8?q?1760279549617188128?= Change the function arm_iommu_create_mapping() to take a pointer to a const bus_type as the function does not modify the variable the pointer points to at all, and the driver core bus functions it calls all expect a const * type. Cc: Russell King Cc: Greg Kroah-Hartman Cc: "Russell King (Oracle)" Cc: Arnd Bergmann Cc: Robin Murphy Cc: Kees Cook Cc: Lukas Bulwahn Cc: Ben Dooks Cc: Linus Walleij Cc: linux-arm-kernel@lists.infradead.org Signed-off-by: Greg Kroah-Hartman --- Note, this is a patch that is a prepatory cleanup as part of a larger series of patches that is working on resolving some old driver core design mistakes. It will build and apply cleanly on top of 6.3-rc2 on its own, but I'd prefer if I could take it through my driver-core tree so that the driver core changes can be taken through there for 6.4-rc1. arch/arm/include/asm/dma-iommu.h | 2 +- arch/arm/mm/dma-mapping.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/include/asm/dma-iommu.h b/arch/arm/include/asm/dma-iommu.h index fe9ef6f79e9c..82ec1ccf1fee 100644 --- a/arch/arm/include/asm/dma-iommu.h +++ b/arch/arm/include/asm/dma-iommu.h @@ -24,7 +24,7 @@ struct dma_iommu_mapping { }; struct dma_iommu_mapping * -arm_iommu_create_mapping(struct bus_type *bus, dma_addr_t base, u64 size); +arm_iommu_create_mapping(const struct bus_type *bus, dma_addr_t base, u64 size); void arm_iommu_release_mapping(struct dma_iommu_mapping *mapping); diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c index 8bc01071474a..b4a33358d2e9 100644 --- a/arch/arm/mm/dma-mapping.c +++ b/arch/arm/mm/dma-mapping.c @@ -1543,7 +1543,7 @@ static const struct dma_map_ops iommu_ops = { * arm_iommu_attach_device function. */ struct dma_iommu_mapping * -arm_iommu_create_mapping(struct bus_type *bus, dma_addr_t base, u64 size) +arm_iommu_create_mapping(const struct bus_type *bus, dma_addr_t base, u64 size) { unsigned int bits = size >> PAGE_SHIFT; unsigned int bitmap_size = BITS_TO_LONGS(bits) * sizeof(long); From patchwork Mon Mar 13 18:29:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 69027 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1346923wrd; Mon, 13 Mar 2023 11:46:38 -0700 (PDT) X-Google-Smtp-Source: AK7set9z4unVWDyWFaOQufNcfsTE9+i/ytdLwdctYqe+0Ob96/W2cCaJr5zISIyj2cbfNAkW6DxZ X-Received: by 2002:a05:6a20:914d:b0:d3:eb34:9cfe with SMTP id x13-20020a056a20914d00b000d3eb349cfemr6655728pzc.5.1678733197979; Mon, 13 Mar 2023 11:46:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678733197; cv=none; d=google.com; s=arc-20160816; b=r5B63TR6I2AN8HeqQPdci/uHj/nQ+PnQgD+t0j/gNuE0I/vAuxMX1m9Qg48rLNTHWQ 5z0FlBL+pl6xKIFg+pRpuuFM1ZSjvik5z7q8QS9Uj7rgB4LjMN2dgik5udNIPXgJuzwU dahgGpootLuM0iBlpckXqITI6Yv9LDqRj8Hhlv3gye8dQEXgB5tnx3l+y9PpgWiIc7Sx LwiK9wNPpAY7EHm8n+2Qh98qOKo2PqS73g93D0jqz3iuESO9wDlf2lAAoHEbw+u6odpB WpAKeV0Q7BZhAi6NgdsQTn0FTx5rVh4mGMN4uPHWDQHYlUcTzROSUvmE4VQ1yK6bqKqe LmJQ== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=6XBgMhSTrYvbeX36kop/n1/tbsAtGtNt+mlz1EtmcOs=; b=Y0THG3it/kAbnr/8476ZDQGCfE/3pEwJrODbIKroHoLbWRUy0BMgBlCFr2HhU8IIqK FPNd/vASldc9wm94e2Gb/W/aunrusvyjnzsDe7FSYevUHfPpR+Vh8lB6rrd/4GScx0CI FtgJpxxhX+R38T8doPz18fNCdRvxUr6WsmochwZKqc7nzF/Qc937yIZOx2ABcuRJIfDZ QaUVqinhm0Kf3nU6Fp0tFYWuQLl2blibSDR0NZlhpOVKeZ8JV92afKg9SDRXDdQrs+DS 8u7/nuijw9A/XiV1ZPA/HYVamtvV6N9N0phNqMgg6lt93x3d70SQnzLVGnS9UDd+edXC zYmQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="R61D2i5/"; 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 q36-20020a635064000000b00502f0d2abc5si123142pgl.725.2023.03.13.11.46.25; Mon, 13 Mar 2023 11:46:37 -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="R61D2i5/"; 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 S230521AbjCMScA (ORCPT + 99 others); Mon, 13 Mar 2023 14:32:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34008 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231240AbjCMSbX (ORCPT ); Mon, 13 Mar 2023 14:31:23 -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 8B95D8314B for ; Mon, 13 Mar 2023 11:30:47 -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 EA88FB811EC for ; Mon, 13 Mar 2023 18:30:31 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4CC29C433D2; Mon, 13 Mar 2023 18:30:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1678732230; bh=g4E1wcKH/Q2KGgYcTLAN52CLQs15rnqXo1TtKmLx46o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=R61D2i5/fk67iJoda+wbgLOGSt9ImnLcOdLA4W24Yt1HFIVMotg2ZcGOSj9uk6Q6M YnGH0wG9ML2NWLHj1eimhg9xLWxAeY+ENtd9TOZk7HviDXvI1PS6vWR82vwHV/rpqo fPBlRktYODsEc2jf435Dcn1/ZL32WuRNl4OBPNkw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: rafael@kernel.org, Greg Kroah-Hartman , Joerg Roedel , Will Deacon , Robin Murphy , iommu@lists.linux.dev Subject: [PATCH 34/36] iommu: make the pointer to struct bus_type constant Date: Mon, 13 Mar 2023 19:29:16 +0100 Message-Id: <20230313182918.1312597-34-gregkh@linuxfoundation.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230313182918.1312597-1-gregkh@linuxfoundation.org> References: <20230313182918.1312597-1-gregkh@linuxfoundation.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=5053; i=gregkh@linuxfoundation.org; h=from:subject; bh=g4E1wcKH/Q2KGgYcTLAN52CLQs15rnqXo1TtKmLx46o=; b=owGbwMvMwCRo6H6F97bub03G02pJDCn82TWL3ReXsm1/p/3H/ayG66UMRdHDNjF3rXSbyooqP my+6KzUEcvCIMjEICumyPJlG8/R/RWHFL0MbU/DzGFlAhnCwMUpABNZeIdhruBJw+nfCrtmTCvs df7p2VYjwxhjzTDPaLpDcDlXZca1N/d8RY+qp67qK5kAAA== X-Developer-Key: i=gregkh@linuxfoundation.org; a=openpgp; fpr=F4B60CC5BF78C2214A313DCB3147D40DDB2DFB29 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, 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?1760279341675481043?= X-GMAIL-MSGID: =?utf-8?q?1760279341675481043?= A number of iommu functions take a struct bus_type * and never modify the data passed in, so make them all const * as that is what the driver core is expecting to have passed into as well. This is a step toward making all struct bus_type pointers constant in the kernel. Cc: Joerg Roedel Cc: Will Deacon Cc: Robin Murphy Cc: iommu@lists.linux.dev Signed-off-by: Greg Kroah-Hartman Acked-by: Joerg Roedel --- Note, this is a patch that is a prepatory cleanup as part of a larger series of patches that is working on resolving some old driver core design mistakes. It will build and apply cleanly on top of 6.3-rc2 on its own, but I'd prefer if I could take it through my driver-core tree so that the driver core changes can be taken through there for 6.4-rc1. drivers/iommu/iommu.c | 14 +++++++------- include/linux/iommu.h | 10 +++++----- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c index 10db680acaed..0b5e181998c9 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -89,7 +89,7 @@ static int iommu_bus_notifier(struct notifier_block *nb, unsigned long action, void *data); static int iommu_alloc_default_domain(struct iommu_group *group, struct device *dev); -static struct iommu_domain *__iommu_domain_alloc(struct bus_type *bus, +static struct iommu_domain *__iommu_domain_alloc(const struct bus_type *bus, unsigned type); static int __iommu_attach_device(struct iommu_domain *domain, struct device *dev); @@ -1631,7 +1631,7 @@ static int iommu_get_def_domain_type(struct device *dev) return 0; } -static int iommu_group_alloc_default_domain(struct bus_type *bus, +static int iommu_group_alloc_default_domain(const struct bus_type *bus, struct iommu_group *group, unsigned int type) { @@ -1777,7 +1777,7 @@ static int probe_get_default_domain_type(struct device *dev, void *data) return 0; } -static void probe_alloc_default_domain(struct bus_type *bus, +static void probe_alloc_default_domain(const struct bus_type *bus, struct iommu_group *group) { struct __group_domain_type gtype; @@ -1832,7 +1832,7 @@ static int iommu_group_create_direct_mappings(struct iommu_group *group) iommu_do_create_direct_mappings); } -int bus_iommu_probe(struct bus_type *bus) +int bus_iommu_probe(const struct bus_type *bus) { struct iommu_group *group, *next; LIST_HEAD(group_list); @@ -1876,7 +1876,7 @@ int bus_iommu_probe(struct bus_type *bus) return ret; } -bool iommu_present(struct bus_type *bus) +bool iommu_present(const struct bus_type *bus) { return bus->iommu_ops != NULL; } @@ -1951,7 +1951,7 @@ void iommu_set_fault_handler(struct iommu_domain *domain, } EXPORT_SYMBOL_GPL(iommu_set_fault_handler); -static struct iommu_domain *__iommu_domain_alloc(struct bus_type *bus, +static struct iommu_domain *__iommu_domain_alloc(const struct bus_type *bus, unsigned type) { struct iommu_domain *domain; @@ -1976,7 +1976,7 @@ static struct iommu_domain *__iommu_domain_alloc(struct bus_type *bus, return domain; } -struct iommu_domain *iommu_domain_alloc(struct bus_type *bus) +struct iommu_domain *iommu_domain_alloc(const struct bus_type *bus) { return __iommu_domain_alloc(bus, IOMMU_DOMAIN_UNMANAGED); } diff --git a/include/linux/iommu.h b/include/linux/iommu.h index 6595454d4f48..0fd4e6734d5b 100644 --- a/include/linux/iommu.h +++ b/include/linux/iommu.h @@ -455,11 +455,11 @@ static inline const struct iommu_ops *dev_iommu_ops(struct device *dev) return dev->iommu->iommu_dev->ops; } -extern int bus_iommu_probe(struct bus_type *bus); -extern bool iommu_present(struct bus_type *bus); +extern int bus_iommu_probe(const struct bus_type *bus); +extern bool iommu_present(const struct bus_type *bus); extern bool device_iommu_capable(struct device *dev, enum iommu_cap cap); extern bool iommu_group_has_isolated_msi(struct iommu_group *group); -extern struct iommu_domain *iommu_domain_alloc(struct bus_type *bus); +extern struct iommu_domain *iommu_domain_alloc(const struct bus_type *bus); extern struct iommu_group *iommu_group_get_by_id(int id); extern void iommu_domain_free(struct iommu_domain *domain); extern int iommu_attach_device(struct iommu_domain *domain, @@ -732,7 +732,7 @@ struct iommu_device {}; struct iommu_fault_param {}; struct iommu_iotlb_gather {}; -static inline bool iommu_present(struct bus_type *bus) +static inline bool iommu_present(const struct bus_type *bus) { return false; } @@ -742,7 +742,7 @@ static inline bool device_iommu_capable(struct device *dev, enum iommu_cap cap) return false; } -static inline struct iommu_domain *iommu_domain_alloc(struct bus_type *bus) +static inline struct iommu_domain *iommu_domain_alloc(const struct bus_type *bus) { return NULL; } From patchwork Mon Mar 13 18:29:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 69042 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1348198wrd; Mon, 13 Mar 2023 11:49:46 -0700 (PDT) X-Google-Smtp-Source: AK7set/lM1uFiJiQ2cwI+DAmDiwqxnTqU3i9DMwP/CqTAwDvm3umSUnLziOcNaToHmhpdQfjMMN/ X-Received: by 2002:a17:902:c404:b0:19f:e9e7:4cb with SMTP id k4-20020a170902c40400b0019fe9e704cbmr6902344plk.45.1678733385971; Mon, 13 Mar 2023 11:49:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678733385; cv=none; d=google.com; s=arc-20160816; b=YlhfR8tmTYBi1B680kSKo/x5gYVPyVUf2ZC19sS+GRCVGEI4pV2vZPZ05LsSt9bNLd o0tYRoOH4LO6c0Qvbh4HP/fEsKyC33E6UO7BvUq5pffKTH1QBn/c18YcoMykGx761oN2 oplOMw/ZLI7EoxhBZ76fHQ1iJnfnqidLWbKJaS+hqZa2i3wTHaUGcRISXgtTEwbms4xL RFuSHX5pTfM4CZmkL18E5W+zn0qGww4fxLpdNLWOXsHEiDFlLOHoU2KbDoJq6uBTUPa8 4Cu18nWwmXyyRG35vhb00sOJ35Jqe32tcZ/m56hAeYzlWrRIZHi92mGsqUYJqy3lAruE wnfg== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=WFBKlSQTBuM7M7Zs29HH5Onxs/D2NcE+JmfYe+ECQSc=; b=neb3tlt/8TmSPX6H67DLRdbumCiYa+wsLq/jd9mZsV6LhfZvQnGHwkpuBfAZSU0Xgu v9gcvYTawU07SeL6aEZX0K5fHYYTKmyBzYFQUnzoWyUQTlE5c11EYODQMY7IOH1O4VTq MtCmhC4WWdRX51eLh3yKvR/OhsVJiQl0z+rsG6NPGWEEhsgqxfTS9SBPxnrOgxYGuF8v kOM1c2keTWUzPTiFvpE7VXKc+Ezah3/NZ1AijeOzzLD/Iw9nLJRDHZ1ScBlOmWeswhTt fx53EHKYSBJK3eZcoLrO0ga3RlImnCHH7o2hwhLp5/ISPEe6HPT1GhlMQ7ayni7po92C ATgg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=2d6OlmXw; 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 f4-20020a170902ce8400b0019cf747251asi451893plg.289.2023.03.13.11.49.33; Mon, 13 Mar 2023 11:49:45 -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=2d6OlmXw; 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 S231346AbjCMScU (ORCPT + 99 others); Mon, 13 Mar 2023 14:32:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34632 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231342AbjCMSbd (ORCPT ); Mon, 13 Mar 2023 14:31:33 -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 6567584F40 for ; Mon, 13 Mar 2023 11:30:54 -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 9D25DB811E9 for ; Mon, 13 Mar 2023 18:30:34 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E45B6C43445; Mon, 13 Mar 2023 18:30:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1678732233; bh=nZpR9Ls6zoTSW4yfmOuFttWaTg8gO18NtXJ/5900W0A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=2d6OlmXwiE7eG1cSclXl4V9sMyC2/B88Wz9jwa8Sho6TMwReKrdsR2AkXn81RGt77 UJzonx9EenISs2acjdJTbRYX0wf1JqBMcTNCycnvQx3Dy33OHa2ycGlJvvkOwP5GMq LpUhug8VRvcvp/fnejZXDRuyoXNIMGWY5kosfJnM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: rafael@kernel.org, Greg Kroah-Hartman Subject: [PATCH 35/36] driver core: device.h: make struct bus_type a const * Date: Mon, 13 Mar 2023 19:29:17 +0100 Message-Id: <20230313182918.1312597-35-gregkh@linuxfoundation.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230313182918.1312597-1-gregkh@linuxfoundation.org> References: <20230313182918.1312597-1-gregkh@linuxfoundation.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=954; i=gregkh@linuxfoundation.org; h=from:subject; bh=nZpR9Ls6zoTSW4yfmOuFttWaTg8gO18NtXJ/5900W0A=; b=owGbwMvMwCRo6H6F97bub03G02pJDCn82bUXCiYGxZzQmXc3/spR+z8XHs/LvCiXHbJpqcUJ2 Qt/v1Q+6IhlYRBkYpAVU2T5so3n6P6KQ4pehranYeawMoEMYeDiFICJhMsxzJX0WH748PWzHw1m N/Zn2/V3HD0Qa8iw4ESyzduZngI+xzZvzlH5u1m47+q+KQA= X-Developer-Key: i=gregkh@linuxfoundation.org; a=openpgp; fpr=F4B60CC5BF78C2214A313DCB3147D40DDB2DFB29 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, 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?1760279539098210276?= X-GMAIL-MSGID: =?utf-8?q?1760279539098210276?= Now that all users who accessed the bus_type structure in struct device are properly using it as a const *, mark it as such so that no one can modify it going forward anymore. Cc: "Rafael J. Wysocki" Signed-off-by: Greg Kroah-Hartman --- include/linux/device.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/device.h b/include/linux/device.h index 0f128520f6e5..9a8573409685 100644 --- a/include/linux/device.h +++ b/include/linux/device.h @@ -564,7 +564,7 @@ struct device { const char *init_name; /* initial name of the device */ const struct device_type *type; - struct bus_type *bus; /* type of bus device is on */ + const struct bus_type *bus; /* type of bus device is on */ struct device_driver *driver; /* which driver has allocated this device */ void *platform_data; /* Platform specific data, device From patchwork Mon Mar 13 18:29:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 69056 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1356606wrd; Mon, 13 Mar 2023 12:08:57 -0700 (PDT) X-Google-Smtp-Source: AK7set9zS25g3485oWAtVq5lt5cgcgHFxp1u02M8ynJShshi00nzVEycUX0XiFGTZ297MJ0iT5jQ X-Received: by 2002:a17:90a:aa0d:b0:23d:1852:d3b7 with SMTP id k13-20020a17090aaa0d00b0023d1852d3b7mr2777242pjq.25.1678734537215; Mon, 13 Mar 2023 12:08:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678734537; cv=none; d=google.com; s=arc-20160816; b=HcAjk06j7UZdpM+L9oGRoL06MmQxyMlt/KrKas5ySVpr4BUk3SvyVWveHCrnqPfqVl 4yUqWNyp9alWUpxKrTJ3VBsQiOq48ActVo3+v/y1Ejrq3XjqL3NJPz2dayHIJn94g80m rvwnfpYqJ6n+tYEG/RRd3bJ+kAHSo3dH3Jl8/u/DROcqhVR1qlgYy4ckZQVnus2KAxGc lq+TAfeCd1NXqUujER5h7jGYfAi1VdBdpGg7r1gg52MWBbG54Da0V6n0cMXBSzEBwRBX /+8tVuPJvtxtXyOPdb/7UhxA2engC7AHagRMin9BosVO0Vafl4Wa4Obpusx+m2ZtJt6Z eaPA== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=isBx4956p81UCQMSJd7xToxp4yD8fJ+ZPxZmQzuLSHw=; b=rmLrvQstjz1PkwOfKcZAEqxQ/z9guu1jPS0wiYmgzA5DPOUZSbgQJkMtcI52yRI4qC Ib14yd67XJFgEtG0H0T4a8syRJKk3gx6GLGdA7ehgOnbR9xkWeaEAbGwuDEeY96106YB kVjzNSkZuDmUkzcea17fpVxFJw/qABMgygYQDy2Xqyq2gnUAdgdxu/PA5gGwxWxtbbtq 6y8Dq3In2Tr8hM5Lt1OS9AQ1pkyDRcw+nhYC+WUOxrrJsXAs2c1JB3ckHK4oErMPeJVN hFnuhVMpmX7PSvxz+saL0DCzFSJXgLakT4MBLvkxgLvkk9BVHfoG0cbtPpczwprEPv8C seJQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=ZvbKwuPv; 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 ci21-20020a17090afc9500b0023d19dfe8a3si405565pjb.94.2023.03.13.12.08.44; Mon, 13 Mar 2023 12:08:57 -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=ZvbKwuPv; 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 S231414AbjCMSdk (ORCPT + 99 others); Mon, 13 Mar 2023 14:33:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34674 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231356AbjCMSc6 (ORCPT ); Mon, 13 Mar 2023 14:32:58 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 65F20856A5; Mon, 13 Mar 2023 11:31:43 -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 7115E61481; Mon, 13 Mar 2023 18:30:36 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 835B4C433D2; Mon, 13 Mar 2023 18:30:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1678732235; bh=jbSk29LRT47p9ipZ5FjfZEDf0clY16OD8paogIGp0U0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZvbKwuPvAphpBvTFrJRHcAYcuVbgey6nHCGTDYa84OqaX7Ar+MbX7RcZMcXmkavWW u8uKWKqKN7Eb1xruK6sCAbIa8Up3O7z4a4v+i/Z0s6u82Ym+G5jRx3Z+HWw93ZLZWm K5yU2yo5d2pfLqFJL78t5g0yQJ4V4oH9qfqX7pTM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: rafael@kernel.org, Greg Kroah-Hartman , Heikki Krogerus , Johan Hovold , Evan Green , Alan Stern , linux-usb@vger.kernel.org Subject: [PATCH 36/36] USB: mark all struct bus_type as const Date: Mon, 13 Mar 2023 19:29:18 +0100 Message-Id: <20230313182918.1312597-36-gregkh@linuxfoundation.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230313182918.1312597-1-gregkh@linuxfoundation.org> References: <20230313182918.1312597-1-gregkh@linuxfoundation.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=4943; i=gregkh@linuxfoundation.org; h=from:subject; bh=jbSk29LRT47p9ipZ5FjfZEDf0clY16OD8paogIGp0U0=; b=owGbwMvMwCRo6H6F97bub03G02pJDCn82bXf337cOuFPbenUyOu8VzZN8jjq9/7D3CkchwI4R dg0j3992xHLwiDIxCArpsjyZRvP0f0VhxS9DG1Pw8xhZQIZwsDFKQATia9hmKfkED3xyrsX215d /Gfo5VIxYelVQW2GBRvKsmVqCjsC21vFMrw+ZqTIugqfAgA= X-Developer-Key: i=gregkh@linuxfoundation.org; a=openpgp; fpr=F4B60CC5BF78C2214A313DCB3147D40DDB2DFB29 X-Spam-Status: No, score=-7.1 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?1760280745737785343?= X-GMAIL-MSGID: =?utf-8?q?1760280745737785343?= Now that the driver core can properly handle constant struct bus_type, move all of the USB subsystem struct bus_type structures as const, placing them into read-only memory which can not be modified at runtime. Cc: Heikki Krogerus Cc: Johan Hovold Cc: Evan Green Cc: Alan Stern Cc: linux-usb@vger.kernel.org Signed-off-by: Greg Kroah-Hartman Acked-by: Heikki Krogerus --- drivers/usb/common/ulpi.c | 2 +- drivers/usb/core/driver.c | 2 +- drivers/usb/core/usb.h | 2 +- drivers/usb/gadget/udc/core.c | 4 ++-- drivers/usb/serial/bus.c | 2 +- drivers/usb/typec/bus.c | 2 +- drivers/usb/typec/bus.h | 2 +- include/linux/usb/serial.h | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/usb/common/ulpi.c b/drivers/usb/common/ulpi.c index a98b2108376a..8305a5dfb910 100644 --- a/drivers/usb/common/ulpi.c +++ b/drivers/usb/common/ulpi.c @@ -90,7 +90,7 @@ static void ulpi_remove(struct device *dev) drv->remove(to_ulpi_dev(dev)); } -static struct bus_type ulpi_bus = { +static const struct bus_type ulpi_bus = { .name = "ulpi", .match = ulpi_match, .uevent = ulpi_uevent, diff --git a/drivers/usb/core/driver.c b/drivers/usb/core/driver.c index a0e076c6f3a4..f58a0299fb3b 100644 --- a/drivers/usb/core/driver.c +++ b/drivers/usb/core/driver.c @@ -2025,7 +2025,7 @@ int usb_disable_usb2_hardware_lpm(struct usb_device *udev) #endif /* CONFIG_PM */ -struct bus_type usb_bus_type = { +const struct bus_type usb_bus_type = { .name = "usb", .match = usb_device_match, .uevent = usb_uevent, diff --git a/drivers/usb/core/usb.h b/drivers/usb/core/usb.h index 0eac7d4285d1..cd434af259c3 100644 --- a/drivers/usb/core/usb.h +++ b/drivers/usb/core/usb.h @@ -140,7 +140,7 @@ static inline int usb_disable_usb2_hardware_lpm(struct usb_device *udev) #endif -extern struct bus_type usb_bus_type; +extern const struct bus_type usb_bus_type; extern struct mutex usb_port_peer_mutex; extern struct device_type usb_device_type; extern struct device_type usb_if_device_type; diff --git a/drivers/usb/gadget/udc/core.c b/drivers/usb/gadget/udc/core.c index 23b0629a8774..61a9c231deb9 100644 --- a/drivers/usb/gadget/udc/core.c +++ b/drivers/usb/gadget/udc/core.c @@ -26,7 +26,7 @@ static DEFINE_IDA(gadget_id_numbers); -static struct bus_type gadget_bus_type; +static const struct bus_type gadget_bus_type; /** * struct usb_udc - describes one usb device controller @@ -1747,7 +1747,7 @@ static int usb_udc_uevent(const struct device *dev, struct kobj_uevent_env *env) return 0; } -static struct bus_type gadget_bus_type = { +static const struct bus_type gadget_bus_type = { .name = "gadget", .probe = gadget_bind_driver, .remove = gadget_unbind_driver, diff --git a/drivers/usb/serial/bus.c b/drivers/usb/serial/bus.c index 9e38142acd38..3eb8dc3a1a8f 100644 --- a/drivers/usb/serial/bus.c +++ b/drivers/usb/serial/bus.c @@ -144,7 +144,7 @@ static void free_dynids(struct usb_serial_driver *drv) spin_unlock(&drv->dynids.lock); } -struct bus_type usb_serial_bus_type = { +const struct bus_type usb_serial_bus_type = { .name = "usb-serial", .match = usb_serial_device_match, .probe = usb_serial_device_probe, diff --git a/drivers/usb/typec/bus.c b/drivers/usb/typec/bus.c index 098f0efaa58d..fe5b9a2e61f5 100644 --- a/drivers/usb/typec/bus.c +++ b/drivers/usb/typec/bus.c @@ -431,7 +431,7 @@ static void typec_remove(struct device *dev) adev->ops = NULL; } -struct bus_type typec_bus = { +const struct bus_type typec_bus = { .name = "typec", .dev_groups = typec_groups, .match = typec_match, diff --git a/drivers/usb/typec/bus.h b/drivers/usb/typec/bus.h index c89168857417..643b8c81786d 100644 --- a/drivers/usb/typec/bus.h +++ b/drivers/usb/typec/bus.h @@ -28,7 +28,7 @@ struct altmode { #define to_altmode(d) container_of(d, struct altmode, adev) -extern struct bus_type typec_bus; +extern const struct bus_type typec_bus; extern const struct device_type typec_altmode_dev_type; #define is_typec_altmode(_dev_) (_dev_->type == &typec_altmode_dev_type) diff --git a/include/linux/usb/serial.h b/include/linux/usb/serial.h index f7bfedb740f5..7eeb5f9c4f0d 100644 --- a/include/linux/usb/serial.h +++ b/include/linux/usb/serial.h @@ -378,7 +378,7 @@ void usb_serial_handle_dcd_change(struct usb_serial_port *usb_port, int usb_serial_bus_register(struct usb_serial_driver *device); void usb_serial_bus_deregister(struct usb_serial_driver *device); -extern struct bus_type usb_serial_bus_type; +extern const struct bus_type usb_serial_bus_type; extern struct tty_driver *usb_serial_tty_driver; static inline void usb_serial_debug_data(struct device *dev,