From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755346Ab0CKIbT (ORCPT ); Thu, 11 Mar 2010 03:31:19 -0500 Received: from mail-yx0-f200.google.com ([209.85.210.200]:63215 "EHLO mail-yx0-f200.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751910Ab0CKIbS (ORCPT ); Thu, 11 Mar 2010 03:31:18 -0500 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:mime-version:content-type :content-disposition:user-agent; b=ILgpZLfP3Irp8mx64zur8SGSNT7qitHBVZJtVU1feK7lEYJJj7R6yE1kBbiSgLO0Bm u7ka0B/Q0r035KkfCO1svKkhcQrNuvH1n4jT7tqFYo48SIUC0eG3VWvZ1KKSV9E2DuPO QZR+jJRBSOWrJ4sPMhjWstfBRWwO28sGzDyw0= Date: Thu, 11 Mar 2010 00:31:11 -0800 From: Dmitry Torokhov To: LKML Cc: Greg KH , "Eric W. Biederman" Subject: [PATCH] firmware loader: use statically initialized data attribute Message-ID: <20100311083111.GA11183@core.coreip.homeip.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-08-17) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org There is no reason why we are using a template for binary attribute and copying it into per-firmware data before registering. Using the original works as well and gets rid of the following lockdep compaint: platform microcode: firmware: requesting intel-ucode/06-0f-0b BUG: key ffff88011371be70 not in .data! ------------[ cut here ]------------ WARNING: at kernel/lockdep.c:2706 lockdep_init_map+0x125/0x140() Hardware name: Latitude D630 Modules linked in: ... Pid: 738, comm: modprobe Tainted: P 2.6.34-rc1 #237 Call Trace: [] warn_slowpath_common+0x76/0xb0 [] warn_slowpath_null+0xf/0x20 [] lockdep_init_map+0x125/0x140 [] sysfs_add_file_mode+0x6a/0xc0 [] sysfs_add_file+0xc/0x10 [] sysfs_create_bin_file+0x21/0x30 [] fw_setup_device+0x81/0x120 [] _request_firmware+0xbf/0x270 [] request_firmware+0xe/0x10 [] request_microcode_fw+0x61/0xa0 [microcode] [] microcode_init_cpu+0xb8/0xd0 [microcode] [] mc_sysdev_add+0x56/0x70 [microcode] [] sysdev_driver_register+0x9e/0x130 [] ? microcode_init+0x0/0x12a [microcode] [] microcode_init+0xbd/0x12a [microcode] [] do_one_initcall+0x37/0x190 [] sys_init_module+0xd8/0x250 [] system_call_fastpath+0x16/0x1b ---[ end trace 93c9f72439beee7f ]--- Signed-off-by: Dmitry Torokhov --- drivers/base/firmware_class.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c index d0dc26a..3f50b2e 100644 --- a/drivers/base/firmware_class.c +++ b/drivers/base/firmware_class.c @@ -41,7 +41,6 @@ static DEFINE_MUTEX(fw_lock); struct firmware_priv { char *fw_id; struct completion completion; - struct bin_attribute attr_data; struct firmware *fw; unsigned long status; struct page **pages; @@ -344,8 +343,8 @@ out: return retval; } -static struct bin_attribute firmware_attr_data_tmpl = { - .attr = {.name = "data", .mode = 0644}, +static struct bin_attribute firmware_attr_data = { + .attr = { .name = "data", .mode = 0644 }, .size = 0, .read = firmware_data_read, .write = firmware_data_write, @@ -390,7 +389,6 @@ static int fw_register_device(struct device **dev_p, const char *fw_name, } init_completion(&fw_priv->completion); - fw_priv->attr_data = firmware_attr_data_tmpl; fw_priv->fw_id = kstrdup(fw_name, GFP_KERNEL); if (!fw_priv->fw_id) { dev_err(device, "%s: Firmware name allocation failed\n", @@ -442,7 +440,7 @@ static int fw_setup_device(struct firmware *fw, struct device **dev_p, fw_priv = dev_get_drvdata(f_dev); fw_priv->fw = fw; - retval = sysfs_create_bin_file(&f_dev->kobj, &fw_priv->attr_data); + retval = sysfs_create_bin_file(&f_dev->kobj, &firmware_attr_data); if (retval) { dev_err(device, "%s: sysfs_create_bin_file failed\n", __func__); goto error_unreg; -- Dmitry