Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964857AbVIMWrM (ORCPT ); Tue, 13 Sep 2005 18:47:12 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S964867AbVIMWrM (ORCPT ); Tue, 13 Sep 2005 18:47:12 -0400 Received: from ms-smtp-04.nyroc.rr.com ([24.24.2.58]:41163 "EHLO ms-smtp-04.nyroc.rr.com") by vger.kernel.org with ESMTP id S964857AbVIMWrL (ORCPT ); Tue, 13 Sep 2005 18:47:11 -0400 Date: Tue, 13 Sep 2005 19:15:55 -0400 From: Adam Kropelin To: kristen.c.accardi@intel.com Cc: pcihpd-discuss@lists.sourceforge.net, linux-kernel@vger.kernel.org Subject: [PATCH] pciehp: Use dword accessors for PCI_ROM_ADDRESS Message-ID: <20050913191555.C10911@mail.kroptech.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5.1i In-reply-to: <20050913182550.A10911@mail.kroptech.com> Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1350 Lines: 33 PCI_ROM_ADDRESS is a 32 bit register and as such should be accessed using pci_bus_{read,write}_config_dword(). A recent audit of drivers/ turned up several cases of byte- and word-sized accesses. The harmful ones were fixed by Linus directly. This patches up one of the remaining harmless-but-still-wrong cases caught in the dragnet. Signed-off-by: Adam Kropelin --- linux-2.6.14-rc1.orig/drivers/pci/hotplug/pciehp_ctrl.c 2005-08-29 09:04:07.000000000 -0400 +++ linux-2.6.14-rc1/drivers/pci/hotplug/pciehp_ctrl.c 2005-09-13 11:57:31.000000000 -0400 @@ -2526,7 +2526,6 @@ int cloop; u8 temp_byte; u8 class_code; - u16 temp_word; u32 rc; u32 temp_register; u32 base; @@ -2682,8 +2681,7 @@ } /* End of base register loop */ /* disable ROM base Address */ - temp_word = 0x00L; - rc = pci_bus_write_config_word (pci_bus, devfn, PCI_ROM_ADDRESS, temp_word); + rc = pci_bus_write_config_dword (pci_bus, devfn, PCI_ROM_ADDRESS, 0x00); /* Set HP parameters (Cache Line Size, Latency Timer) */ rc = pciehprm_set_hpp(ctrl, func, PCI_HEADER_TYPE_NORMAL); - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/