Skip to content

Commit fa35b49

Browse files
Bjorn Helgaaslenb
Bjorn Helgaas
authored and
lenb
committed
PNPACPI: add window support
Add support for resource windows. This is for bridge resources, i.e., regions where a bridge forwards transactions from the primary to the secondary side. This does not add support for *setting* windows via the /proc interface. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Signed-off-by: Len Brown <len.brown@intel.com>
1 parent 9d7cca0 commit fa35b49

File tree

2 files changed

+24
-17
lines changed

2 files changed

+24
-17
lines changed

‎drivers/pnp/interface.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -278,9 +278,11 @@ static ssize_t pnp_show_current_resources(struct device *dmdev,
278278
switch (pnp_resource_type(res)) {
279279
case IORESOURCE_IO:
280280
case IORESOURCE_MEM:
281-
pnp_printf(buffer, " %#llx-%#llx\n",
281+
pnp_printf(buffer, " %#llx-%#llx%s\n",
282282
(unsigned long long) res->start,
283-
(unsigned long long) res->end);
283+
(unsigned long long) res->end,
284+
res->flags & IORESOURCE_WINDOW ?
285+
" window" : "");
284286
break;
285287
case IORESOURCE_IRQ:
286288
case IORESOURCE_DMA:

‎drivers/pnp/pnpacpi/rsparser.c

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,8 @@ static int dma_flags(struct pnp_dev *dev, int type, int bus_master,
177177
}
178178

179179
static void pnpacpi_parse_allocated_ioresource(struct pnp_dev *dev, u64 start,
180-
u64 len, int io_decode)
180+
u64 len, int io_decode,
181+
int window)
181182
{
182183
int flags = 0;
183184
u64 end = start + len - 1;
@@ -186,6 +187,8 @@ static void pnpacpi_parse_allocated_ioresource(struct pnp_dev *dev, u64 start,
186187
flags |= IORESOURCE_IO_16BIT_ADDR;
187188
if (len == 0 || end >= 0x10003)
188189
flags |= IORESOURCE_DISABLED;
190+
if (window)
191+
flags |= IORESOURCE_WINDOW;
189192

190193
pnp_add_io_resource(dev, start, end, flags);
191194
}
@@ -247,7 +250,7 @@ static void pnpacpi_parse_allocated_vendor(struct pnp_dev *dev,
247250

248251
static void pnpacpi_parse_allocated_memresource(struct pnp_dev *dev,
249252
u64 start, u64 len,
250-
int write_protect)
253+
int write_protect, int window)
251254
{
252255
int flags = 0;
253256
u64 end = start + len - 1;
@@ -256,6 +259,8 @@ static void pnpacpi_parse_allocated_memresource(struct pnp_dev *dev,
256259
flags |= IORESOURCE_DISABLED;
257260
if (write_protect == ACPI_READ_WRITE_MEMORY)
258261
flags |= IORESOURCE_MEM_WRITEABLE;
262+
if (window)
263+
flags |= IORESOURCE_WINDOW;
259264

260265
pnp_add_mem_resource(dev, start, end, flags);
261266
}
@@ -265,6 +270,7 @@ static void pnpacpi_parse_allocated_address_space(struct pnp_dev *dev,
265270
{
266271
struct acpi_resource_address64 addr, *p = &addr;
267272
acpi_status status;
273+
int window;
268274

269275
status = acpi_resource_to_address64(res, p);
270276
if (!ACPI_SUCCESS(status)) {
@@ -273,37 +279,36 @@ static void pnpacpi_parse_allocated_address_space(struct pnp_dev *dev,
273279
return;
274280
}
275281

276-
if (p->producer_consumer == ACPI_PRODUCER)
277-
return;
282+
window = (p->producer_consumer == ACPI_PRODUCER) ? 1 : 0;
278283

279284
if (p->resource_type == ACPI_MEMORY_RANGE)
280285
pnpacpi_parse_allocated_memresource(dev,
281286
p->minimum, p->address_length,
282-
p->info.mem.write_protect);
287+
p->info.mem.write_protect, window);
283288
else if (p->resource_type == ACPI_IO_RANGE)
284289
pnpacpi_parse_allocated_ioresource(dev,
285290
p->minimum, p->address_length,
286291
p->granularity == 0xfff ? ACPI_DECODE_10 :
287-
ACPI_DECODE_16);
292+
ACPI_DECODE_16, window);
288293
}
289294

290295
static void pnpacpi_parse_allocated_ext_address_space(struct pnp_dev *dev,
291296
struct acpi_resource *res)
292297
{
293298
struct acpi_resource_extended_address64 *p = &res->data.ext_address64;
299+
int window;
294300

295-
if (p->producer_consumer == ACPI_PRODUCER)
296-
return;
301+
window = (p->producer_consumer == ACPI_PRODUCER) ? 1 : 0;
297302

298303
if (p->resource_type == ACPI_MEMORY_RANGE)
299304
pnpacpi_parse_allocated_memresource(dev,
300305
p->minimum, p->address_length,
301-
p->info.mem.write_protect);
306+
p->info.mem.write_protect, window);
302307
else if (p->resource_type == ACPI_IO_RANGE)
303308
pnpacpi_parse_allocated_ioresource(dev,
304309
p->minimum, p->address_length,
305310
p->granularity == 0xfff ? ACPI_DECODE_10 :
306-
ACPI_DECODE_16);
311+
ACPI_DECODE_16, window);
307312
}
308313

309314
static acpi_status pnpacpi_allocated_resource(struct acpi_resource *res,
@@ -368,7 +373,7 @@ static acpi_status pnpacpi_allocated_resource(struct acpi_resource *res,
368373
pnpacpi_parse_allocated_ioresource(dev,
369374
io->minimum,
370375
io->address_length,
371-
io->io_decode);
376+
io->io_decode, 0);
372377
break;
373378

374379
case ACPI_RESOURCE_TYPE_START_DEPENDENT:
@@ -380,7 +385,7 @@ static acpi_status pnpacpi_allocated_resource(struct acpi_resource *res,
380385
pnpacpi_parse_allocated_ioresource(dev,
381386
fixed_io->address,
382387
fixed_io->address_length,
383-
ACPI_DECODE_10);
388+
ACPI_DECODE_10, 0);
384389
break;
385390

386391
case ACPI_RESOURCE_TYPE_VENDOR:
@@ -396,21 +401,21 @@ static acpi_status pnpacpi_allocated_resource(struct acpi_resource *res,
396401
pnpacpi_parse_allocated_memresource(dev,
397402
memory24->minimum,
398403
memory24->address_length,
399-
memory24->write_protect);
404+
memory24->write_protect, 0);
400405
break;
401406
case ACPI_RESOURCE_TYPE_MEMORY32:
402407
memory32 = &res->data.memory32;
403408
pnpacpi_parse_allocated_memresource(dev,
404409
memory32->minimum,
405410
memory32->address_length,
406-
memory32->write_protect);
411+
memory32->write_protect, 0);
407412
break;
408413
case ACPI_RESOURCE_TYPE_FIXED_MEMORY32:
409414
fixed_memory32 = &res->data.fixed_memory32;
410415
pnpacpi_parse_allocated_memresource(dev,
411416
fixed_memory32->address,
412417
fixed_memory32->address_length,
413-
fixed_memory32->write_protect);
418+
fixed_memory32->write_protect, 0);
414419
break;
415420
case ACPI_RESOURCE_TYPE_ADDRESS16:
416421
case ACPI_RESOURCE_TYPE_ADDRESS32:

0 commit comments

Comments
 (0)