Linux-Next Archive on lore.kernel.org
 help / color / Atom feed
* linux-next: manual merge of the jc_docs tree with the arm-perf tree
@ 2019-11-05  0:37 Stephen Rothwell
  2019-11-05 18:11 ` Will Deacon
  0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2019-11-05  0:37 UTC (permalink / raw)
  To: Jonathan Corbet, Will Deacon
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Adam Zerella,
	Joakim Zhang

[-- Attachment #1: Type: text/plain, Size: 3380 bytes --]

Hi all,

Today's linux-next merge of the jc_docs tree got a conflict in:

  Documentation/admin-guide/perf/imx-ddr.rst

between commits:

  76d835fcd429 ("docs/perf: Add explanation for DDR_CAP_AXI_ID_FILTER_ENHANCED quirk")
  ed0207a33add ("docs/perf: Add AXI ID filter capabilities information")

from the arm-perf tree and commit:

  0522e130b00a ("docs: perf: Add imx-ddr to documentation index")

from the jc_docs tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc Documentation/admin-guide/perf/imx-ddr.rst
index 90056e4e8859,92900b851f5d..000000000000
--- a/Documentation/admin-guide/perf/imx-ddr.rst
+++ b/Documentation/admin-guide/perf/imx-ddr.rst
@@@ -17,9 -17,10 +17,11 @@@ The "format" directory describes forma
  (AXI filtering) fields of the perf_event_attr structure, see /sys/bus/event_source/
  devices/imx8_ddr0/format/. The "events" directory describes the events types
  hardware supported that can be used with perf tool, see /sys/bus/event_source/
 -devices/imx8_ddr0/events/.
 +devices/imx8_ddr0/events/. The "caps" directory describes filter features implemented
 +in DDR PMU, see /sys/bus/events_source/devices/imx8_ddr0/caps/.
-   e.g.::
+ 
+     .. code-block:: bash
+ 
          perf stat -a -e imx8_ddr0/cycles/ cmd
          perf stat -a -e imx8_ddr0/read/,imx8_ddr0/write/ cmd
  
@@@ -45,17 -44,18 +48,23 @@@ value 1 for supported
  
    This filter doesn't support filter different AXI ID for axid-read and axid-write
    event at the same time as this filter is shared between counters.
-   e.g.::
-         perf stat -a -e imx8_ddr0/axid-read,axi_mask=0xMMMM,axi_id=0xDDDD/ cmd
-         perf stat -a -e imx8_ddr0/axid-write,axi_mask=0xMMMM,axi_id=0xDDDD/ cmd
- 
-   NOTE: axi_mask is inverted in userspace(i.e. set bits are bits to mask), and
-   it will be reverted in driver automatically. so that the user can just specify
-   axi_id to monitor a specific id, rather than having to specify axi_mask.
-   e.g.::
-         perf stat -a -e imx8_ddr0/axid-read,axi_id=0x12/ cmd, which will monitor ARID=0x12
+ 
+   .. code-block:: bash
+ 
+       perf stat -a -e imx8_ddr0/axid-read,axi_mask=0xMMMM,axi_id=0xDDDD/ cmd
+       perf stat -a -e imx8_ddr0/axid-write,axi_mask=0xMMMM,axi_id=0xDDDD/ cmd
+ 
+   .. note::
+ 
+       axi_mask is inverted in userspace(i.e. set bits are bits to mask), and
+       it will be reverted in driver automatically. so that the user can just specify
+       axi_id to monitor a specific id, rather than having to specify axi_mask.
+ 
+   .. code-block:: bash
+ 
+       perf stat -a -e imx8_ddr0/axid-read,axi_id=0x12/ cmd, which will monitor ARID=0x12
 +
 +* With DDR_CAP_AXI_ID_FILTER_ENHANCED quirk(filter: 1, enhanced_filter: 1).
 +  This is an extension to the DDR_CAP_AXI_ID_FILTER quirk which permits
 +  counting the number of bytes (as opposed to the number of bursts) from DDR
 +  read and write transactions concurrently with another set of data counters.

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: linux-next: manual merge of the jc_docs tree with the arm-perf tree
  2019-11-05  0:37 linux-next: manual merge of the jc_docs tree with the arm-perf tree Stephen Rothwell
@ 2019-11-05 18:11 ` Will Deacon
  2019-11-05 19:13   ` Jonathan Corbet
  0 siblings, 1 reply; 3+ messages in thread
From: Will Deacon @ 2019-11-05 18:11 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Jonathan Corbet, Linux Next Mailing List,
	Linux Kernel Mailing List, Adam Zerella, Joakim Zhang

On Tue, Nov 05, 2019 at 11:37:26AM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the jc_docs tree got a conflict in:
> 
>   Documentation/admin-guide/perf/imx-ddr.rst
> 
> between commits:
> 
>   76d835fcd429 ("docs/perf: Add explanation for DDR_CAP_AXI_ID_FILTER_ENHANCED quirk")
>   ed0207a33add ("docs/perf: Add AXI ID filter capabilities information")
> 
> from the arm-perf tree and commit:
> 
>   0522e130b00a ("docs: perf: Add imx-ddr to documentation index")
> 
> from the jc_docs tree.
> 
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.

Looks fine to me, thanks. Jon -- are you ok living with this conflict?

Will

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: linux-next: manual merge of the jc_docs tree with the arm-perf tree
  2019-11-05 18:11 ` Will Deacon
@ 2019-11-05 19:13   ` Jonathan Corbet
  0 siblings, 0 replies; 3+ messages in thread
From: Jonathan Corbet @ 2019-11-05 19:13 UTC (permalink / raw)
  To: Will Deacon
  Cc: Stephen Rothwell, Linux Next Mailing List,
	Linux Kernel Mailing List, Adam Zerella, Joakim Zhang

On Tue, 5 Nov 2019 18:11:38 +0000
Will Deacon <will@kernel.org> wrote:

> Looks fine to me, thanks. Jon -- are you ok living with this conflict?

Just another day in the life of the docs tree...:)  No worries here.
Thanks, Stephen.

jon

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, back to index

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-11-05  0:37 linux-next: manual merge of the jc_docs tree with the arm-perf tree Stephen Rothwell
2019-11-05 18:11 ` Will Deacon
2019-11-05 19:13   ` Jonathan Corbet

Linux-Next Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-next/0 linux-next/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-next linux-next/ https://lore.kernel.org/linux-next \
		linux-next@vger.kernel.org
	public-inbox-index linux-next

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-next


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git