From patchwork Wed Feb 26 19:09:12 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 3727641 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 64EE59F2F7 for ; Wed, 26 Feb 2014 19:10:21 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7DAD320211 for ; Wed, 26 Feb 2014 19:10:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8E7E6201F9 for ; Wed, 26 Feb 2014 19:10:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753640AbaBZTJT (ORCPT ); Wed, 26 Feb 2014 14:09:19 -0500 Received: from mail-ie0-f171.google.com ([209.85.223.171]:63552 "EHLO mail-ie0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753603AbaBZTJR (ORCPT ); Wed, 26 Feb 2014 14:09:17 -0500 Received: by mail-ie0-f171.google.com with SMTP id to1so1085120ieb.16 for ; Wed, 26 Feb 2014 11:09:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=subject:to:from:cc:date:message-id:in-reply-to:references :user-agent:mime-version:content-type:content-transfer-encoding; bh=tXflNuOLQ7rX6YVFsZXIEMsqST3t7YP+LNxwreuQ8VM=; b=O3xk2cKFkcG7/SuqzddsyXsiF26T1IGyRDqZ2ubKAalz16v2mN7b1MV8x2yHJK2KUv SPfdZCqNGD6A1/zc9tbCZvFCLY9vT8co/KaaiuTA3PUXLkGOHWFrVIJyxcKXBKjListN TY/a9lt5eNsWtH8mDjEwXNDBARsHJwz7aiwCeh52un0LbQyhuwl6zWsrZw58Iia0jdbN riK7+JBWz1QuoaYmrzaBUW2Xi2FDvOYtNFevTrw8sjPIkvlbeQdT1qHZ7vaQpeh4Jvku IzvmE80QurLQJy7/EjMfQUQL364TvU4ZCadfwT090JHRkquamzUg5d9Y0lKj57eZDFfF 5rYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:subject:to:from:cc:date:message-id:in-reply-to :references:user-agent:mime-version:content-type :content-transfer-encoding; bh=tXflNuOLQ7rX6YVFsZXIEMsqST3t7YP+LNxwreuQ8VM=; b=FfdldeZ3/KCJTj3+oNGiUrvMyYxDPrTQcJMK52BP2Zhp9Mj8CxiWZK2A7mOYIZlbjt lGNE2StolEdglRMWyWETd8YLPiy9k804ygtbV68lMObcD2wu6K2VxymjyRUm+TZDPAnN Lr15vwcyDHEMLF7YMGnqYuigzK+p736m3jCxalpTM++t2mtKLzLV4XuWfTs5DsTE5xcg qxkDCM9lX7wpslB6p6GyCE8HNVOAuvgO6Dmd96GwcXyjXzNIthfZGWH+AxiH1N04CkwZ bnYEQa2T5503bWfr/mOM5dwa4v2D5XYGdVWEflN5yC4gkdcSXjQawY8fT3FqOsPoCuk7 fjjw== X-Gm-Message-State: ALoCoQkF9LTv73EzJny0aaXzWm3T6FxJXKAMiZRlNxanQcNffg12RwzU55evC29ux1KR/PXSNc/1jtlgdkzqNQzP+rMFR0p6AhdQcV6LQM/Mdz+pjAyypF3nbeuraDmtBrN24L2RiQet0724K2Hotp+O5yg7cSeKvfMUEt/I1DG3ClyrrknnE2yPQCgqwbl+HI5CtLLiP0LkTczCaUWctjVkc7gHVn7jt5Dcnr/NHGrAXuSfTpAlAKI= X-Received: by 10.50.137.100 with SMTP id qh4mr28863882igb.4.1393441756401; Wed, 26 Feb 2014 11:09:16 -0800 (PST) Received: from localhost ([172.16.49.60]) by mx.google.com with ESMTPSA id om7sm2424958igb.10.2014.02.26.11.09.13 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 26 Feb 2014 11:09:15 -0800 (PST) Subject: [PATCH 2/4] i2o: Fix I/O space alignment requirement To: linux-pci@vger.kernel.org From: Bjorn Helgaas Cc: Markus Lidel , linux-kernel@vger.kernel.org Date: Wed, 26 Feb 2014 12:09:12 -0700 Message-ID: <20140226190912.9616.50210.stgit@bhelgaas-glaptop.roam.corp.google.com> In-Reply-To: <20140226190306.9616.30567.stgit@bhelgaas-glaptop.roam.corp.google.com> References: <20140226190306.9616.30567.stgit@bhelgaas-glaptop.roam.corp.google.com> User-Agent: StGit/0.16 MIME-Version: 1.0 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP When i2o_iop_systab_set() allocates I/O port space, it specifies 1Mb alignment required. This seems unlikely, since most platforms have only 64Kb of I/O space total. I think 4Kb is a more reasonable choice, since that's the minimum alignment of a PCI-PCI bridge I/O window. My guess is that this is a copy/paste error from the memory allocation code, which specifies 1Mb alignment (which is the minimum alignment of a PCI-PCI bridge memory window). Signed-off-by: Bjorn Helgaas --- drivers/message/i2o/iop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/message/i2o/iop.c b/drivers/message/i2o/iop.c index a8373d7aaef7..68aef58bf89c 100644 --- a/drivers/message/i2o/iop.c +++ b/drivers/message/i2o/iop.c @@ -700,7 +700,7 @@ static int i2o_iop_systab_set(struct i2o_controller *c) root = pci_find_parent_resource(c->pdev, res); if (root == NULL) osm_warn("%s: Can't find parent resource!\n", c->name); - if (root && allocate_resource(root, res, sb->desired_io_size, sb->desired_io_size, sb->desired_io_size, 1 << 20, /* Unspecified, so use 1Mb and play safe */ + if (root && allocate_resource(root, res, sb->desired_io_size, sb->desired_io_size, sb->desired_io_size, 1 << 12, /* Unspecified, so use 4Kb and play safe */ NULL, NULL) >= 0) { c->io_alloc = 1; sb->current_io_size = resource_size(res);