/* * Copyright (C) 2005-2006 by Texas Instruments * * The Inventra Controller Driver for Linux is free software; you * can redistribute it and/or modify it under the terms of the GNU * General Public License version 2 as published by the Free Software * Foundation. */ #ifndef __MUSB_HDRDF_H__ #define __MUSB_HDRDF_H__ /* * DaVinci-specific definitions */ /* Integrated highspeed/otg PHY */ #define USBPHY_CTL_PADDR 0x01c40034 #define USBPHY_DATAPOL BIT(11) /* (dm355) switch D+/D- */ #define USBPHY_PHYCLKGD BIT(8) #define USBPHY_SESNDEN BIT(7) /* v(sess_end) comparator */ #define USBPHY_VBDTCTEN BIT(6) /* v(bus) comparator */ #define USBPHY_VBUSSENS BIT(5) /* (dm355,ro) is vbus > 0.5V */ #define USBPHY_PHYPLLON BIT(4) /* override pll suspend */ #define USBPHY_CLKO1SEL BIT(3) #define USBPHY_OSCPDWN BIT(2) #define USBPHY_OTGPDWN BIT(1) #define USBPHY_PHYPDWN BIT(0) #define DM355_DEEPSLEEP_PADDR 0x01c40048 #define DRVVBUS_FORCE BIT(2) #define DRVVBUS_OVERRIDE BIT(1) /* For now include usb OTG module registers here */ #define DAVINCI_USB_VERSION_REG 0x00 #define DAVINCI_USB_CTRL_REG 0x04 #define DAVINCI_USB_STAT_REG 0x08 #define DAVINCI_RNDIS_REG 0x10 #define DAVINCI_AUTOREQ_REG 0x14 #define DAVINCI_USB_INT_SOURCE_REG 0x20 #define DAVINCI_USB_INT_SET_REG 0x24 #define DAVINCI_USB_INT_SRC_CLR_REG 0x28 #define DAVINCI_USB_INT_MASK_REG 0x2c #define DAVINCI_USB_INT_MASK_SET_REG 0x30 #define DAVINCI_USB_INT_MASK_CLR_REG 0x34 #define DAVINCI_USB_INT_SRC_MASKED_REG 0x38 #define DAVINCI_USB_EOI_REG 0x3c #define DAVINCI_USB_EOI_INTVEC 0x40 /* BEGIN CPPI-generic (?) */ /* CPPI related registers */ #define DAVINCI_TXCPPI_CTRL_REG 0x80 #define DAVINCI_TXCPPI_TEAR_REG 0x84 #define DAVINCI_CPPI_EOI_REG 0x88 #define DAVINCI_CPPI_INTVEC_REG 0x8c #define DAVINCI_TXCPPI_MASKED_REG 0x90 #define DAVINCI_TXCPPI_RAW_REG 0x94 #define DAVINCI_TXCPPI_INTENAB_REG 0x98 #define DAVINCI_TXCPPI_INTCLR_REG 0x9c #define DAVINCI_RXCPPI_CTRL_REG 0xC0 #define DAVINCI_RXCPPI_MASKED_REG 0xD0 #define DAVINCI_RXCPPI_RAW_REG 0xD4 #define DAVINCI_RXCPPI_INTENAB_REG 0xD8 #define DAVINCI_RXCPPI_INTCLR_REG 0xDC #define DAVINCI_RXCPPI_BUFCNT0_REG 0xE0 #define DAVINCI_RXCPPI_BUFCNT1_REG 0xE4 #define DAVINCI_RXCPPI_BUFCNT2_REG 0xE8 #define DAVINCI_RXCPPI_BUFCNT3_REG 0xEC /* CPPI state RAM entries */ #define DAVINCI_CPPI_STATERAM_BASE_OFFSET 0x100 #define DAVINCI_TXCPPI_STATERAM_OFFSET(chnum) \ (DAVINCI_CPPI_STATERAM_BASE_OFFSET + ((chnum) * 0x40)) #define DAVINCI_RXCPPI_STATERAM_OFFSET(chnum) \ (DAVINCI_CPPI_STATERAM_BASE_OFFSET + 0x20 + ((chnum) * 0x40)) /* CPPI masks */ #define DAVINCI_DMA_CTRL_ENABLE 1 #define DAVINCI_DMA_CTRL_DISABLE 0 #define DAVINCI_DMA_ALL_CHANNELS_ENABLE 0xF #define DAVINCI_DMA_ALL_CHANNELS_DISABLE 0xF /* END CPPI-generic (?) */ #define DAVINCI_USB_TX_ENDPTS_MASK 0x1f /* ep0 + 4 tx */ #define DAVINCI_USB_RX_ENDPTS_MASK 0x1e /* 4 rx */ #define DAVINCI_USB_USBINT_SHIFT 16 #define DAVINCI_USB_TXINT_SHIFT 0 #define DAVINCI_USB_RXINT_SHIFT 8 #define DAVINCI_INTR_DRVVBUS 0x0100 #define DAVINCI_USB_USBINT_MASK 0x01ff0000 /* 8 Mentor, DRVVBUS */ #define DAVINCI_USB_TXINT_MASK \ (DAVINCI_USB_TX_ENDPTS_MASK << DAVINCI_USB_TXINT_SHIFT) #define DAVINCI_USB_RXINT_MASK \ (DAVINCI_USB_RX_ENDPTS_MASK << DAVINCI_USB_RXINT_SHIFT) #define DAVINCI_BASE_OFFSET 0x400 #endif /* __MUSB_HDRDF_H__ */ vents/arch?id=2ee89fb9a942e250b5adb5535de4acca14bb7fa2'>arch/x86/nehalemep/virtual-memory.json
;
AgeCommit message (Expand)AuthorFilesLines
2017-01-23 18:21:58 +0100
committerPablo Neira Ayuso <pablo@netfilter.org>2017-02-02 14:31:55 +0100
commit303223092081963513494b4377fa1ac9e362ed4b (patch)
treee312cf241ada3f96d5844613770ebbeeb152585c
parentc74454fadd5ea6fc866ffe2c417a0dba56b2bf1c (diff)
netfilter: guarantee 8 byte minalign for template addresses
The next change will merge skb->nfct pointer and skb->nfctinfo status bits into single skb->_nfct (unsigned long) area. For this to work nf_conn addresses must always be aligned at least on an 8 byte boundary since we will need the lower 3bits to store nfctinfo. Conntrack templates are allocated via kmalloc. kbuild test robot reported BUILD_BUG_ON failed: NFCT_INFOMASK >= ARCH_KMALLOC_MINALIGN on v1 of this patchset, so not all platforms meet this requirement. Do manual alignment if needed, the alignment offset is stored in the nf_conn entry protocol area. This works because templates are not handed off to L4 protocol trackers. Reported-by: kbuild test robot <fengguang.wu@intel.com> Signed-off-by: Florian Westphal <fw@strlen.de> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat
-rw-r--r--include/net/netfilter/nf_conntrack.h2
-rw-r--r--net/netfilter/nf_conntrack_core.c29
2 files changed, 26 insertions, 5 deletions
diff --git a/include/net/netfilter/nf_conntrack.h b/include/net/netfilter/nf_conntrack.h