Eric Lee / smarc-fsl-linux-kernel

08 Aug, 2018

1 commit

d88e61faa iommu: Remove the ->map_sg indirection ... Browse Code »

All iommu drivers use the default_iommu_map_sg implementation, and there
is no good reason to ever override it. Just expose it as iommu_map_sg
directly and remove the indirection, specially in our post-spectre world
where indirect calls are horribly expensive.

Signed-off-by: Christoph Hellwig
Signed-off-by: Joerg Roedel

Christoph Hellwig
2018-08-08 17:06:20 +0800

13 Jun, 2018

1 commit

42bc47b35 treewide: Use array_size() in vmalloc() ... Browse Code »

The vmalloc() function has no 2-factor argument form, so multiplication
factors need to be wrapped in array_size(). This patch replaces cases of:

vmalloc(a * b)

with:
vmalloc(array_size(a, b))

as well as handling cases of:

vmalloc(a * b * c)

with:

vmalloc(array3_size(a, b, c))

This does, however, attempt to ignore constant size factors like:

vmalloc(4 * 1024)

though any constants defined via macros get caught up in the conversion.

Any factors with a sizeof() of "unsigned char", "char", and "u8" were
dropped, since they're redundant.

The Coccinelle script used for this was:

// Fix redundant parens around sizeof().
@@
type TYPE;
expression THING, E;
@@

(
vmalloc(
- (sizeof(TYPE)) * E
+ sizeof(TYPE) * E
, ...)
|
vmalloc(
- (sizeof(THING)) * E
+ sizeof(THING) * E
, ...)
)

// Drop single-byte sizes and redundant parens.
@@
expression COUNT;
typedef u8;
typedef __u8;
@@

(
vmalloc(
- sizeof(u8) * (COUNT)
+ COUNT
, ...)
|
vmalloc(
- sizeof(__u8) * (COUNT)
+ COUNT
, ...)
|
vmalloc(
- sizeof(char) * (COUNT)
+ COUNT
, ...)
|
vmalloc(
- sizeof(unsigned char) * (COUNT)
+ COUNT
, ...)
|
vmalloc(
- sizeof(u8) * COUNT
+ COUNT
, ...)
|
vmalloc(
- sizeof(__u8) * COUNT
+ COUNT
, ...)
|
vmalloc(
- sizeof(char) * COUNT
+ COUNT
, ...)
|
vmalloc(
- sizeof(unsigned char) * COUNT
+ COUNT
, ...)
)

// 2-factor product with sizeof(type/expression) and identifier or constant.
@@
type TYPE;
expression THING;
identifier COUNT_ID;
constant COUNT_CONST;
@@

(
vmalloc(
- sizeof(TYPE) * (COUNT_ID)
+ array_size(COUNT_ID, sizeof(TYPE))
, ...)
|
vmalloc(
- sizeof(TYPE) * COUNT_ID
+ array_size(COUNT_ID, sizeof(TYPE))
, ...)
|
vmalloc(
- sizeof(TYPE) * (COUNT_CONST)
+ array_size(COUNT_CONST, sizeof(TYPE))
, ...)
|
vmalloc(
- sizeof(TYPE) * COUNT_CONST
+ array_size(COUNT_CONST, sizeof(TYPE))
, ...)
|
vmalloc(
- sizeof(THING) * (COUNT_ID)
+ array_size(COUNT_ID, sizeof(THING))
, ...)
|
vmalloc(
- sizeof(THING) * COUNT_ID
+ array_size(COUNT_ID, sizeof(THING))
, ...)
|
vmalloc(
- sizeof(THING) * (COUNT_CONST)
+ array_size(COUNT_CONST, sizeof(THING))
, ...)
|
vmalloc(
- sizeof(THING) * COUNT_CONST
+ array_size(COUNT_CONST, sizeof(THING))
, ...)
)

// 2-factor product, only identifiers.
@@
identifier SIZE, COUNT;
@@

vmalloc(
- SIZE * COUNT
+ array_size(COUNT, SIZE)
, ...)

// 3-factor product with 1 sizeof(type) or sizeof(expression), with
// redundant parens removed.
@@
expression THING;
identifier STRIDE, COUNT;
type TYPE;
@@

(
vmalloc(
- sizeof(TYPE) * (COUNT) * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
vmalloc(
- sizeof(TYPE) * (COUNT) * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
vmalloc(
- sizeof(TYPE) * COUNT * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
vmalloc(
- sizeof(TYPE) * COUNT * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
vmalloc(
- sizeof(THING) * (COUNT) * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
|
vmalloc(
- sizeof(THING) * (COUNT) * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
|
vmalloc(
- sizeof(THING) * COUNT * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
|
vmalloc(
- sizeof(THING) * COUNT * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
)

// 3-factor product with 2 sizeof(variable), with redundant parens removed.
@@
expression THING1, THING2;
identifier COUNT;
type TYPE1, TYPE2;
@@

(
vmalloc(
- sizeof(TYPE1) * sizeof(TYPE2) * COUNT
+ array3_size(COUNT, sizeof(TYPE1), sizeof(TYPE2))
, ...)
|
vmalloc(
- sizeof(TYPE1) * sizeof(THING2) * (COUNT)
+ array3_size(COUNT, sizeof(TYPE1), sizeof(TYPE2))
, ...)
|
vmalloc(
- sizeof(THING1) * sizeof(THING2) * COUNT
+ array3_size(COUNT, sizeof(THING1), sizeof(THING2))
, ...)
|
vmalloc(
- sizeof(THING1) * sizeof(THING2) * (COUNT)
+ array3_size(COUNT, sizeof(THING1), sizeof(THING2))
, ...)
|
vmalloc(
- sizeof(TYPE1) * sizeof(THING2) * COUNT
+ array3_size(COUNT, sizeof(TYPE1), sizeof(THING2))
, ...)
|
vmalloc(
- sizeof(TYPE1) * sizeof(THING2) * (COUNT)
+ array3_size(COUNT, sizeof(TYPE1), sizeof(THING2))
, ...)
)

// 3-factor product, only identifiers, with redundant parens removed.
@@
identifier STRIDE, SIZE, COUNT;
@@

(
vmalloc(
- (COUNT) * STRIDE * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
vmalloc(
- COUNT * (STRIDE) * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
vmalloc(
- COUNT * STRIDE * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
vmalloc(
- (COUNT) * (STRIDE) * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
vmalloc(
- COUNT * (STRIDE) * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
vmalloc(
- (COUNT) * STRIDE * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
vmalloc(
- (COUNT) * (STRIDE) * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
vmalloc(
- COUNT * STRIDE * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
)

// Any remaining multi-factor products, first at least 3-factor products
// when they're not all constants...
@@
expression E1, E2, E3;
constant C1, C2, C3;
@@

(
vmalloc(C1 * C2 * C3, ...)
|
vmalloc(
- E1 * E2 * E3
+ array3_size(E1, E2, E3)
, ...)
)

// And then all remaining 2 factors products when they're not all constants.
@@
expression E1, E2;
constant C1, C2;
@@

(
vmalloc(C1 * C2, ...)
|
vmalloc(
- E1 * E2
+ array_size(E1, E2)
, ...)
)

Signed-off-by: Kees Cook

Kees Cook
2018-06-13 07:19:22 +0800

03 May, 2018

2 commits

130a2fdf0 iommu/tegra: gart: Fix gart_iommu_unmap() ... Browse Code »

It must return the number of unmapped bytes on success, returning 0 means
that unmapping failed and in result only one page is unmapped.

Signed-off-by: Dmitry Osipenko
Reviewed-by: Thierry Reding
Acked-by: Thierry Reding
Signed-off-by: Joerg Roedel

Dmitry Osipenko
2018-05-03 22:30:28 +0800
40c9b882f iommu/tegra: gart: Add debugging facility ... Browse Code »

Page mapping could overwritten by an accident (a bug). We can catch this
case by checking 'VALID' bit of GART's page entry prior to mapping of a
page. Since that check introduces a small performance impact, it should be
enabled explicitly using new GART's kernel module 'debug' parameter.

Signed-off-by: Dmitry Osipenko
Acked-by: Thierry Reding
Signed-off-by: Joerg Roedel

Dmitry Osipenko
2018-05-03 22:30:21 +0800

17 Aug, 2017

1 commit

c184ae83c iommu/tegra-gart: Add support for struct iommu_device ... Browse Code »

Add a struct iommu_device to each tegra-gart and register it
with the iommu-core. Also link devices added to the driver
to their respective hardware iommus.

Reviewed-by: Dmitry Osipenko
Tested-by: Dmitry Osipenko
Acked-by: Thierry Reding
Signed-off-by: Joerg Roedel

Joerg Roedel
2017-08-17 22:31:34 +0800

10 Aug, 2017

1 commit

15f9a3104 iommu/tegra-gart: Add iommu_group support ... Browse Code »

As the last step to making groups mandatory, clean up the remaining
drivers by adding basic support. Whilst it may not perfectly reflect the
isolation capabilities of the hardware, using generic_device_group()
should at least maintain existing behaviour with respect to the API.

Signed-off-by: Robin Murphy
Tested-by: Dmitry Osipenko
Signed-off-by: Joerg Roedel

Robin Murphy
2017-08-10 06:03:50 +0800

02 Apr, 2015

1 commit

7f65ef01e Merge branches 'iommu/fixes', 'x86/vt-d', 'x86/amd', 'arm/smmu', 'arm/tegra' and 'core' into next ... Browse Code »

Conflicts:
drivers/iommu/amd_iommu.c
drivers/iommu/tegra-gart.c
drivers/iommu/tegra-smmu.c

Joerg Roedel
2015-04-02 19:33:19 +0800

31 Mar, 2015

2 commits

836a8ac9f iommu/tegra: gart: Set aperture at domain initialization time ... Browse Code »

The aperture of the domain should always be available, otherwise drivers
need to attach first before they can use the aperture geometry.

Cc: Hiroshi Doyu
Signed-off-by: Thierry Reding
Signed-off-by: Joerg Roedel

Thierry Reding
2015-03-31 22:34:12 +0800
b5cbb386a iommu/tegra-gart: Make use of domain_alloc and domain_free ... Browse Code »

Implement domain_alloc and domain_free iommu-ops as a
replacement for domain_init/domain_destroy.

Tested-by: Thierry Reding
Acked-by: Thierry Reding
Signed-off-by: Joerg Roedel

Joerg Roedel
2015-03-31 21:32:12 +0800

26 Jan, 2015

2 commits

35577079b iommu/tegra: gart: Provide default ->map_sg() callback ... Browse Code »

Commit 315786ebbf4a ("iommu: Add iommu_map_sg() function") adds a new
->map_sg() callback and provides a default implementation that drivers
can use until they implement a hardware-specific variant. Unfortunately
the Tegra GART driver was not updated as part of that commit, so that
iommu_map_sg() calls on a domain provided by the GART cause an oops.

Fixes: 315786ebbf4a ("iommu: Add iommu_map_sg() function")
Cc: Hiroshi Doyu
Signed-off-by: Thierry Reding
Signed-off-by: Joerg Roedel

Thierry Reding
2015-01-26 20:41:07 +0800
c7e3ca515 iommu/tegra: gart: Do not register with bus ... Browse Code »

The driver currently doesn't work as expected and causes existing setups
with Tegra20 to break after commit df06b759f2cf ("drm/tegra: Add IOMMU
support"). To restore these setups, do not register the operations with
the platform bus for now. Fixing this properly will involve non-trivial
changes to the DRM driver, which are unlikely to be accepted at this
point in the release cycle.

Reported-by: Misha Komarovskiy
Reported-by: Nicolas Chauvet
Tested-by: Misha Komarovskiy
Tested-by: Dmitry Osipenko
Cc: Hiroshi Doyu
Signed-off-by: Thierry Reding
Signed-off-by: Joerg Roedel

Thierry Reding
2015-01-26 20:41:07 +0800

20 Oct, 2014

1 commit

98b773cf7 iommu: drop owner assignment from platform_drivers ... Browse Code »

A platform_driver does not need to set an owner, it will be populated by the
driver core.

Signed-off-by: Wolfram Sang

Wolfram Sang
2014-10-20 22:20:42 +0800

25 Sep, 2014

2 commits

d943b0ffb iommu: Make of_device_id array const ... Browse Code »

Make of_device_id array const, because all OF functions handle it as const.

Signed-off-by: Kiran Padwal
Signed-off-by: Joerg Roedel

Kiran Padwal
2014-09-25 22:01:03 +0800
7c2aa6441 iommu/tegra: Convert to iommu_capable() API function ... Browse Code »

Cc: Hiroshi Doyu
Signed-off-by: Joerg Roedel

Joerg Roedel
2014-09-25 21:47:38 +0800

07 Jul, 2014

1 commit

b22f6434c iommu: Constify struct iommu_ops ... Browse Code »

This structure is read-only data and should never be modified.

Signed-off-by: Thierry Reding
Signed-off-by: Greg Kroah-Hartman
Signed-off-by: Joerg Roedel

Thierry Reding
2014-07-07 16:36:59 +0800

01 Nov, 2013

1 commit

8a788659a iommu/tegra-gart: Staticize tegra_gart_pm_ops ... Browse Code »

'tegra_gart_pm_ops' is local to this file. Make it static.

Signed-off-by: Sachin Kamat
Acked-by: Hiroshi Doyu
Signed-off-by: Joerg Roedel

Sachin Kamat
2013-11-01 21:23:20 +0800

24 Sep, 2013

2 commits

d0c5b2579 iommu/tegra: gart: cleanup devm_* functions usage ... Browse Code »

The devm_[kzalloc|ioremap] functions allocates data that are released
when a driver detaches. Thus, there is no reason to explicitly call
devm_[kfree|iounmap] in probe or remove functions.

Signed-off-by: Wei Yongjun
Acked-by: Hiroshi Doyu
Signed-off-by: Joerg Roedel

Wei Yongjun
2013-09-24 21:01:35 +0800
e56b3dab3 iommu/tegra: Print phys_addr_t using %pa ... Browse Code »

When enabling LPAE on ARM, phys_addr_t becomes 64 bits wide and printing
a variable of that type using a simple %x format specifier causes the
compiler to complain. Change the format specifier to %pa, which is used
specifically for variables of type phys_addr_t.

Signed-off-by: Thierry Reding
Acked-by: Olof Johansson
Signed-off-by: Joerg Roedel

Thierry Reding
2013-09-24 20:47:28 +0800

02 May, 2013

2 commits

0c4513be3 Merge branches 'iommu/fixes', 'x86/vt-d', 'x86/amd', 'ppc/pamu', 'core' and 'arm/tegra' into next Browse Code »

Joerg Roedel
2013-05-02 18:10:19 +0800
72ca55dba iommu/tegra: Fix printk formats for dma_addr_t ... Browse Code »

Fix printk formats for dma_addr_t:

drivers/iommu/tegra-smmu.c: In function 'smmu_iommu_iova_to_phys':
>> drivers/iommu/tegra-smmu.c:774:2: warning: format '%lx' expects argument of type 'long unsigned int', but argument 4 has type 'dma_addr_t' [-Wformat]
--
drivers/iommu/tegra-gart.c: In function 'gart_iommu_iova_to_phys':
>> drivers/iommu/tegra-gart.c:298:3: warning: format '%lx' expects argument of type 'long unsigned int', but argument 3 has type 'dma_addr_t' [-Wformat]

Signed-off-by: Varun Sethi
Signed-off-by: Joerg Roedel

Varun Sethi
2013-05-02 18:09:42 +0800

03 Apr, 2013

1 commit

bb5547acf iommu/fsl: Make iova dma_addr_t in the iommu_iova_to_phys API. ... Browse Code »

This is required in case of PAMU, as it can support a window size of up
to 64G (even on 32bit).

Signed-off-by: Varun Sethi
Signed-off-by: Joerg Roedel

Varun Sethi
2013-04-03 00:20:53 +0800

19 Feb, 2013

1 commit

e664e8c09 iommu/tegra: assume CONFIG_OF in gart driver ... Browse Code »

Tegra only supports, and always enables, device tree. Remove all ifdefs
for DT support from the driver.

Signed-off-by: Stephen Warren
Signed-off-by: Joerg Roedel

Stephen Warren
2013-02-19 22:44:41 +0800

04 Jan, 2013

1 commit

d34d6517e Drivers: iommu: remove __dev* attributes. ... Browse Code »

CONFIG_HOTPLUG is going away as an option. As a result, the __dev*
markings need to be removed.

This change removes the use of __devinit, __devexit_p, __devinitdata,
and __devexit from these drivers.

Based on patches originally written by Bill Pemberton, but redone by me
in order to handle some of the coding style issues better, by hand.

Cc: Bill Pemberton
Cc: David Woodhouse
Cc: Joerg Roedel
Cc: Ohad Ben-Cohen
Cc: Tony Lindgren
Cc: Omar Ramirez Luna
Cc: Mauro Carvalho Chehab
Cc: Hiroshi Doyu
Cc: Stephen Warren
Cc: Bharat Nihalani
Signed-off-by: Greg Kroah-Hartman

Greg Kroah-Hartman
2013-01-04 07:57:14 +0800

28 Nov, 2012

1 commit

b7d4bec11 iommu/tegra: gart: Move bus_set_iommu after probe for multi arch ... Browse Code »

For a single image to support multiple SoCs(GART/SMMU).

Reported-by: Arto Merilainen
Signed-off-by: Hiroshi Doyu
Signed-off-by: Joerg Roedel

Hiroshi Doyu
2012-11-28 23:11:52 +0800

11 Jul, 2012

1 commit

23349902e iommu/tegra: Implement DOMAIN_ATTR_GEOMETRY attribute ... Browse Code »

Implement the attribute for the Tegra IOMMU drivers.

Signed-off-by: Hiroshi DOYU
Signed-off-by: Joerg Roedel

Hiroshi DOYU
2012-07-11 18:25:57 +0800

11 May, 2012

1 commit

774dfc9bb iommu/tegra: gart: Fix register offset correctly ... Browse Code »

DT passes the exact GART register ranges without any overlapping with
MC register ranges. GART register offset needs to be adjusted by one
passed by DT correctly.

Signed-off-by: Hiroshi DOYU
Acked-by: Stephen Warren
Signed-off-by: Joerg Roedel

Hiroshi DOYU
2012-05-11 17:42:05 +0800

16 Apr, 2012

2 commits

7cffae421 iommu: tegra/gart: Add device tree support ... Browse Code »

This commit adds device tree support for the GART hardware available on
NVIDIA Tegra 20 SoCs.

Signed-off-by: Thierry Reding
Acked-by: Stephen Warren
Signed-off-by: Joerg Roedel

Thierry Reding
2012-04-16 19:57:16 +0800
543f3f33b iommu: tegra/gart: use correct gart_device ... Browse Code »

Pass the correct gart device pointer.

Reviewed-by: Vandana Salve
Tested-by: Vandana Salve
Reviewed-by: Hiroshi Doyu
Reviewed-by: Bharat Nihalani
Signed-off-by: Hiroshi DOYU
Signed-off-by: Joerg Roedel

Vandana Salve
2012-04-16 19:56:44 +0800

13 Mar, 2012

1 commit

09c32533c iommu/tegra-gart: fix spin_unlock in map failure path ... Browse Code »

This must have been messed up while merging, the intention was
clearly to unlock there.

Signed-off-by: Lucas Stach
Signed-off-by: Joerg Roedel

Lucas Stach
2012-03-13 18:17:42 +0800

26 Jan, 2012

1 commit

d53e54b4d ARM: IOMMU: Tegra20: Add iommu_ops for GART driver ... Browse Code »

Tegra 20 IOMMU H/W, GART (Graphics Address Relocation Table). This
patch implements struct iommu_ops for GART for the upper IOMMU API.

This H/W module supports only single virtual address space(domain),
and manages a single level 1-to-1 mapping H/W translation page table.

[With small fixes by Joerg Roedel]

Signed-off-by: Hiroshi DOYU
Signed-off-by: Joerg Roedel

Hiroshi DOYU
2012-01-26 20:50:28 +0800