From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755351AbbJUPkM (ORCPT ); Wed, 21 Oct 2015 11:40:12 -0400 Received: from mail-bl2on0062.outbound.protection.outlook.com ([65.55.169.62]:8928 "EHLO na01-bl2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753237AbbJUPkH (ORCPT ); Wed, 21 Oct 2015 11:40:07 -0400 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=David.Daney@caviumnetworks.com; Subject: Re: [PATCH v6 0/5] PCI: Add support for PCI Enhanced Allocation "BARs" To: Bjorn Helgaas , David Daney References: <1445382282-2396-1-git-send-email-ddaney.cavm@gmail.com> <20151021151459.GA1583@localhost> CC: , , Bjorn Helgaas , "Michael S. Tsirkin" , =?UTF-8?B?UmFmYcWCIE1pxYJlY2tp?= , , "Sean O. Stalley" , , , , David Daney From: David Daney Message-ID: <5627B1CF.2010703@caviumnetworks.com> Date: Wed, 21 Oct 2015 08:39:59 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.3.0 MIME-Version: 1.0 In-Reply-To: <20151021151459.GA1583@localhost> Content-Type: text/plain; charset="windows-1252"; format=flowed Content-Transfer-Encoding: 7bit X-Originating-IP: [64.2.3.194] X-ClientProxiedBy: SN1PR0701CA0017.namprd07.prod.outlook.com (25.162.96.27) To DM3PR07MB2140.namprd07.prod.outlook.com (25.164.4.146) X-Microsoft-Exchange-Diagnostics: 1;DM3PR07MB2140;2:/dz6NssI5YEygeHkVrTQ77j2e26T2y52kkn7A9OKoT9F2+V29avfXGnHebTBPM89S2ttCoappRlRtO3Ga94d9zsCq9aXHgotugd0BIcTIy7jUmuAYkkjqVRBW/0WeEAVNNvXW0aifrDWUI4QCsUpZQKf1GT35Mk2rYMoudt78uk=;3:lxMFarwSncb+Xkz/fBOvXPHYm4IExno8Y/pLhSfRDQioJpTlECaYUSuG0XFl88UW9uK1xr3ZV84md/E3YTpfAAFKGRA1lRHkEEagkUz17C92yL+ryXmsbmXnai59U1FHlLluOOGTP0GFseJx1gC6jQ==;25:bM5xbav2o7KugPauK5G/Kn3zndszn+fJOehyv2PY9TYv8C/rsuMzMiCW8tthbZFncv79PXUOaR1l9H5/9gNG3RLqrG28xua/T/MIpNhCse3+KDXdAqxyxyXEmxy+HnAL2r7Qh8Dp7HCdNbWAF+DQBCV6ka1ho/+8pVoMw8nsWkqp75zXqdrLdh93Sk03gOTcqw7Uf+T1PWWnixuFHYoCd3PzNdU3SI5vFx9+0sd5LKgT4OlPCpMgsaP3wxZROU/Lef7euYeR+f4cKOFv96KWJQ== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:DM3PR07MB2140; X-Microsoft-Exchange-Diagnostics: 1;DM3PR07MB2140;20:+c6xrb+pLihhOr/z6ayX4GNHLCd/VDXcQN4o3Xb1aLYa4E46hGmXyv5+vqOr5oWgyqBbWkT4yeMLkmqplX3ekdXRI09sPMyjIZ67P9ktS1BIoYsCeSuYC9OKdv717dLLq7JJbLEyq4MtX/ksZcNTMO7NBSyRn0Q/5ANxhuOSmdueDafw5ScdD2ces0I+7wP6drdVcJN5WuXlmLgmDMbX0UruEpeZN8FFcTey00VjPD/FOOFalOYBPQ0NgvEZD47yVuuvQKKp1YGQSklhtO9s5SlZU06sZYIgCUkyjh3jEkJJM5RK49TBWmz34JlWj9oxmj3f3UyrLxTqQFFjSI+M2h4qf1tvg8vTzfD5lDyxU6vDQQ3zeBErcybnVT/N/DKySkWIAv8gJgS7kABBZXWmmkV+9Q3N0/RhpPoBkKCfIkDpLeKxAgafSbB97XAqo7AxDiN4BdpdOHOW3R8X/Ziz0y6n5XJpKaO2XANQ8LSE+O1BucYThMMcIEXAgVjTbgDkDrdZOZZqYHYw+IuLt74rMrYWmhS4Lb0SIImucuI/xlm0ISVgYUKn+O0ui+onBesRbXWqix++BUAp/wA0mLT9OoJNqko3OMH3g1aBQKKER/Y= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(2401047)(520078)(5005006)(8121501046)(3002001)(102115026);SRVR:DM3PR07MB2140;BCL:0;PCL:0;RULEID:;SRVR:DM3PR07MB2140; X-Microsoft-Exchange-Diagnostics: 1;DM3PR07MB2140;4:fDyhwBxMnfbQjjsM3reeRA7OwuuoRaQPBvMOENa892VEWtcXNKlcEV4Yqg+QcATjAiSYu9GwbVpcUsqu2Qzixan+7B1/rbz9fX4M4dLSJyjD4FnWjeUeB+YiokyPgpu1N9VskIpvb8pk8AAOHgoZAkbIY4tn9caZKS3MdlqIol5CRXM8CyIfjaPk5Kcv3EGVYjaXkK8IZ8mxvhLdf5J9UekawpdvCrKlaM/9x06uEj+bNs+PmKZCTtTRI5+WkDKZX6mCsT1lcCM1vtahq+rA+AXXyei4Y7wM1EHGgtAX+N2qzGQqxX5VhDNpHuuFdAN6gIu46DMw/mJG1wyscfPwYZ8WcMa7EOjQpeyIc4aJPStqjckkPlKiUxbwEVFECzU7 X-Forefront-PRVS: 073631BD3D X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(6069001)(6009001)(52604005)(189002)(24454002)(377454003)(199003)(479174004)(42186005)(47776003)(189998001)(69596002)(53416004)(36756003)(106356001)(76506005)(19580395003)(50466002)(64706001)(101416001)(87976001)(105586002)(5004730100002)(76176999)(80316001)(87266999)(19580405001)(64126003)(50986999)(33656002)(54356999)(92566002)(5007970100001)(65816999)(81156007)(46102003)(65806001)(5001770100001)(59896002)(5008740100001)(77096005)(97736004)(83506001)(5001920100001)(122386002)(65956001)(4001350100001)(5001960100002)(40100003)(23746002)(66066001)(2950100001);DIR:OUT;SFP:1101;SCL:1;SRVR:DM3PR07MB2140;H:localhost.caveonetworks.com;FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?Windows-1252?Q?1;DM3PR07MB2140;23:6UZYd53vmirhuQUWHtvIpbZMEdlSutwX2qkrI?= =?Windows-1252?Q?2JZJK9QsJnmXkfl+CE5TBCEgGc9JZQ1IOzf0gaTFtCuKM0lrzIExXXdb?= =?Windows-1252?Q?Zd1rBSgS8w2Ixqli8n6UfHZIM1AVYnO+BeB/aW8BpENf+pr8O1hZ2QOY?= =?Windows-1252?Q?Z+OwOW5sXtVs3S7IrXK7e/mWTktLXcQe4i2HxNg/8+Nk/GSCV2f9J/RS?= =?Windows-1252?Q?77yPn3sIHJD0oK1/k+Dhr7V/HwRTIEXH/lYxAvxMbB7hf/nZB3W0bPFw?= =?Windows-1252?Q?rOGb05tkOKRXK9jei6XWeYBxXT+Vs1CH3qU2pVM5Bp+dJxU8B1t8TikB?= =?Windows-1252?Q?VXZ2XlfnEx9uH+39A0ZbsVVU8vgflEjhOu9hFYGO8uElkQ578s2sTTB3?= =?Windows-1252?Q?Jmqmhak3YXimU0ekclH/lJTSlIJWxc/SD/g5N2NnWzeMSvhLQtQYkjO1?= =?Windows-1252?Q?FvaUOLLKPz9mxPcGKCE9uNEGAk2akRhg22UWGNXO2TL7L5VmyTgXriJC?= =?Windows-1252?Q?3L6NFp34Y/suzivF/D9n5Ko8v3kkMEbIrcKjnLzZ0QKT37hUaa0nPgNQ?= =?Windows-1252?Q?6jT/nFcEpPjVDnAKPKlfWH08w+cN9F40EdgSqaGFnvkZeSRq4sFxhUma?= =?Windows-1252?Q?6FNSgqIylvO2OFohFqFNNbKapXiykgXquR9wlNIj3hQWpwVRqk0kFK3Q?= =?Windows-1252?Q?x/DL39Cnz+vJACpZH2urkvLsgHbdSP0QTH0jiUVhd1KZHzygpl8E4det?= =?Windows-1252?Q?4fNEW9fV11etJ5BIBEzwHCqsQ8uLrSMEwJewuS7Bt052kvbnhkEYxnjp?= =?Windows-1252?Q?I29V8/mVFJkVOPmwZ4JcSqQNAGxOe+kj0kCehMg4zBTC/81Qy7cZOLR8?= =?Windows-1252?Q?4B2riz5bCTqBgThv88WkPB/XCiZ6JTJ09L3vkG+lFBiWNJCFbfF3FS6w?= =?Windows-1252?Q?6nOiQPGR89yY8QyT+uzMosNStA4YncM8lqKTzXjE82B7nXI6jkBRUw8l?= =?Windows-1252?Q?vBBkC24SYG291mEZbPc/hu7sp9yRN71HdixOvOvuAURTz/e3kTetOwyK?= =?Windows-1252?Q?mZYbATjFdSCJ+SDugSPbrPUWMIadDaWZAWZZ/KxT4q1FnxGPBZ3Ka5gn?= =?Windows-1252?Q?ZEngEy8/x5JSCD1jOfRVlygvwJsDE3702+IY7wFvrhsZQcYa63B8FFWR?= =?Windows-1252?Q?T5mep1IcUSRO1lHCV2QiyscfK3HrDZYao10tKXQnMHYG61TWgB5rxo8Y?= =?Windows-1252?Q?KqTsgZlB2g6LI1SvuyXbrgS2zfGrXX/IoVCZkHdtVNp4yRQ6sXQCWIPr?= =?Windows-1252?Q?ul7Hm4oYq3qcN0FkuH3CtFCpvVa5w42ZtOCRAyuX1bUI+/HoZROypooP?= =?Windows-1252?Q?8AcB6MzHaOe2ti2kDYCYCi6t6bt7aLG6ZApb4QjGo/L/6LUXjoBHdnqK?= =?Windows-1252?Q?FcvxNofjtMr/wrBsFIFStorKO8bv9XNg/s1C9rPIAyEg2Brv2QhV8uex?= =?Windows-1252?Q?ln1uXU=3D?= X-Microsoft-Exchange-Diagnostics: 1;DM3PR07MB2140;5:prt4omALEJFmVDANqmknHG3TDGVYtouR8Sdf2qVxud0cp+DOvj0SbNx+/4dYIGgnygNZ8Z7TowvSc9rwNWKNfpvs1bRylDYrlEcKyqlxoRYkAGAOrOdv2LTLAXDgiHlGMuo0PFfq0cxYwxbicq3zoA==;24:ad32UqT94J6LRRq6vKQp5M4E6SQyT0MjLyBZgmqWxjZbZBv/av23mUwCeVP9i/tM+bnE0IwEFn9r/EdXPqjX6lDPZl7uZ/OCNbnS0s5eaHg=;20:srmfZqef0BGVzcGqLbbMnZI1adhbR1RUXzxkbJOiHXrUg0d4PUmXsVpaerrSmd2ju7Y9itdL9ZsJ6YxtDKd1yg== SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Oct 2015 15:40:01.9886 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM3PR07MB2140 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 10/21/2015 08:14 AM, Bjorn Helgaas wrote: [...] > Applied to pci/enhanced-allocation for v4.4, thanks, David! > > I tweaked a couple trivial things and added a couple almost trivial patches > on top. Here are the additions; let me know if you see anything wrong. > Thanks for working with us on this. Your additional changes look to be correct to me, I will give them a test within the next few days. David Daney > Bjorn > > > commit 6457d085fade7d96a3aa6c5dca848fd82b4a4fa4 > Author: Bjorn Helgaas > Date: Wed Oct 21 09:34:15 2015 -0500 > > PCI: Make Enhanced Allocation bitmasks more obvious > > Expand bitmask #defines completely. This puts the shift in the code > instead of in the #define, but it makes it more obvious in the header file > how fields in the register are laid out. > > No functional change. > > Signed-off-by: Bjorn Helgaas > > diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c > index 364f98b..e8330b6 100644 > --- a/drivers/pci/pci.c > +++ b/drivers/pci/pci.c > @@ -2195,7 +2195,7 @@ static int pci_ea_read(struct pci_dev *dev, int offset) > int ent_size, ent_offset = offset; > resource_size_t start, end; > unsigned long flags; > - u32 dw0, base, max_offset; > + u32 dw0, bei, base, max_offset; > u8 prop; > bool support_64 = (sizeof(resource_size_t) >= 8); > > @@ -2208,20 +2208,21 @@ static int pci_ea_read(struct pci_dev *dev, int offset) > if (!(dw0 & PCI_EA_ENABLE)) /* Entry not enabled */ > goto out; > > - prop = PCI_EA_PP(dw0); > + bei = (dw0 & PCI_EA_BEI) >> 4; > + prop = (dw0 & PCI_EA_PP) >> 8; > + > /* > * If the Property is in the reserved range, try the Secondary > * Property instead. > */ > if (prop > PCI_EA_P_BRIDGE_IO && prop < PCI_EA_P_MEM_RESERVED) > - prop = PCI_EA_SP(dw0); > + prop = (dw0 & PCI_EA_SP) >> 16; > if (prop > PCI_EA_P_BRIDGE_IO) > goto out; > > - res = pci_ea_get_resource(dev, PCI_EA_BEI(dw0), prop); > + res = pci_ea_get_resource(dev, bei, prop); > if (!res) { > - dev_err(&dev->dev, "Unsupported EA entry BEI: %u\n", > - PCI_EA_BEI(dw0)); > + dev_err(&dev->dev, "Unsupported EA entry BEI: %u\n", bei); > goto out; > } > > @@ -2293,7 +2294,7 @@ static int pci_ea_read(struct pci_dev *dev, int offset) > res->end = end; > res->flags = flags; > dev_printk(KERN_DEBUG, &dev->dev, "EA - BEI %2u, Prop 0x%02x: %pR\n", > - PCI_EA_BEI(dw0), prop, res); > + bei, prop, res); > out: > return offset + ent_size; > } > diff --git a/include/uapi/linux/pci_regs.h b/include/uapi/linux/pci_regs.h > index f890876..1becea8 100644 > --- a/include/uapi/linux/pci_regs.h > +++ b/include/uapi/linux/pci_regs.h > @@ -361,7 +361,7 @@ > #define PCI_EA_FIRST_ENT 4 /* First EA Entry in List */ > #define PCI_EA_FIRST_ENT_BRIDGE 8 /* First EA Entry for Bridges */ > #define PCI_EA_ES 0x00000007 /* Entry Size */ > -#define PCI_EA_BEI(x) (((x) >> 4) & 0xf) /* BAR Equivalent Indicator */ > +#define PCI_EA_BEI 0x000000f0 /* BAR Equivalent Indicator */ > /* 0-5 map to BARs 0-5 respectively */ > #define PCI_EA_BEI_BAR0 0 > #define PCI_EA_BEI_BAR5 5 > @@ -372,8 +372,8 @@ > #define PCI_EA_BEI_VF_BAR0 9 > #define PCI_EA_BEI_VF_BAR5 14 > #define PCI_EA_BEI_RESERVED 15 /* Reserved - Treat like ENI */ > -#define PCI_EA_PP(x) (((x) >> 8) & 0xff) /* Primary Properties */ > -#define PCI_EA_SP(x) (((x) >> 16) & 0xff) /* Secondary Properties */ > +#define PCI_EA_PP 0x0000ff00 /* Primary Properties */ > +#define PCI_EA_SP 0x00ff0000 /* Secondary Properties */ > #define PCI_EA_P_MEM 0x00 /* Non-Prefetch Memory */ > #define PCI_EA_P_MEM_PREFETCH 0x01 /* Prefetchable Memory */ > #define PCI_EA_P_IO 0x02 /* I/O Space */ > > commit 6985dcc83d70f019523ba9ff499898261f33c937 > Author: Bjorn Helgaas > Date: Wed Oct 21 09:53:39 2015 -0500 > > PCI: Expand Enhanced Allocation BAR output > > An Enhanced Allocation Capability entry with BEI 0 fills in > dev->resource[0] just like a real BAR 0 would, but non-EA experts might not > connect "EA - BEI 0" with BAR 0. > > Decode the EA jargon a little bit, e.g., change this: > > pci 0002:01:00.0: EA - BEI 0, Prop 0x00: [mem 0x84300000-0x84303fff] > > to this: > > pci 0002:01:00.0: BAR 0: [mem 0x84300000-0x84303fff] (from Enhanced Allocation, properties 0x00) > > Signed-off-by: Bjorn Helgaas > > diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c > index e8330b6..3a1454e 100644 > --- a/drivers/pci/pci.c > +++ b/drivers/pci/pci.c > @@ -2293,8 +2293,20 @@ static int pci_ea_read(struct pci_dev *dev, int offset) > res->start = start; > res->end = end; > res->flags = flags; > - dev_printk(KERN_DEBUG, &dev->dev, "EA - BEI %2u, Prop 0x%02x: %pR\n", > - bei, prop, res); > + > + if (bei <= PCI_EA_BEI_BAR5) > + dev_printk(KERN_DEBUG, &dev->dev, "BAR %d: %pR (from Enhanced Allocation, properties %#02x)\n", > + bei, res, prop); > + else if (bei == PCI_EA_BEI_ROM) > + dev_printk(KERN_DEBUG, &dev->dev, "ROM: %pR (from Enhanced Allocation, properties %#02x)\n", > + res, prop); > + else if (bei >= PCI_EA_BEI_VF_BAR0 && bei <= PCI_EA_BEI_VF_BAR5) > + dev_printk(KERN_DEBUG, &dev->dev, "VF BAR %d: %pR (from Enhanced Allocation, properties %#02x)\n", > + bei - PCI_EA_BEI_VF_BAR0, res, prop); > + else > + dev_printk(KERN_DEBUG, &dev->dev, "BEI %d res: %pR (from Enhanced Allocation, properties %#02x)\n", > + bei, res, prop); > + > out: > return offset + ent_size; > } >