From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752518AbbJZQGG (ORCPT ); Mon, 26 Oct 2015 12:06:06 -0400 Received: from mail-bl2on0102.outbound.protection.outlook.com ([65.55.169.102]:18016 "EHLO na01-bl2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751563AbbJZQEv (ORCPT ); Mon, 26 Oct 2015 12:04:51 -0400 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=freescale.com; freescale.mail.onmicrosoft.com; dkim=none (message not signed) header.d=none;freescale.mail.onmicrosoft.com; dmarc=none action=none header.from=freescale.com; From: "J. German Rivera" To: , , , CC: , , , , , , , , , , , , , , "J. German Rivera" Subject: [PATCH 04/10] staging: fsl-mc: Extended MC bus allocator to include IRQs Date: Mon, 26 Oct 2015 10:49:15 -0500 Message-ID: <1445874561-14761-5-git-send-email-German.Rivera@freescale.com> X-Mailer: git-send-email 2.3.3 In-Reply-To: <1445874561-14761-1-git-send-email-German.Rivera@freescale.com> References: <1445874561-14761-1-git-send-email-German.Rivera@freescale.com> X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1;BY2FFO11FD030;1:LVZ8sH8FfcQO8n3EkjYEzttgjD6M7pXi3+7dxxL0AnMvIgMkXykRdt9Ob3oZGCU0U1iO3WdgsyqWuhD3BltqEvkykKcSnQzT7HO3Hj9E1LmRq7gYgRMXHqxWOkB/0/Hhug6yFUCdWB/T3m4ej1S/YdtAHgY0rOYtErBeVEGz50rOHr4RFPcaCYVP6bh77AH4lCT9Gol0WoyhxV56FFPPZsDiD/+J2IQ8kKp567aWZvB+ik88/W8F/JTTeWHia6x7qMG4jgmuzhcU9/hnLFIxxdy64oqjbiXfTPHHcfDuUJA8R94lQBWRGsldhau/R0ma84f9sr5U2TqSS0/Of4nHAgb/FVU8BdlROaBL3gkNJvj6Q1HGeBN2NyeK51MjxjCaYOeRqsp0Fpsh8GCOW7EaKg== X-Forefront-Antispam-Report: CIP:192.88.168.50;CTRY:US;IPV:NLI;EFV:NLI;SFV:NSPM;SFS:(10019020)(6009001)(2980300002)(1109001)(1110001)(339900001)(189002)(199003)(87936001)(50466002)(77096005)(106466001)(92566002)(48376002)(19580395003)(105606002)(2950100001)(50986999)(19580405001)(76176999)(47776003)(50226001)(107886002)(5001920100001)(189998001)(5008740100001)(5890100001)(81156007)(5001770100001)(85426001)(5001960100002)(97736004)(5007970100001)(2201001)(6806005)(229853001)(86362001)(4001430100002)(104016004)(5003940100001)(36756003);DIR:OUT;SFP:1102;SCL:1;SRVR:BLUPR03MB504;H:tx30smr01.am.freescale.net;FPR:;SPF:Fail;PTR:InfoDomainNonexistent;MX:1;A:1;LANG:en; MIME-Version: 1.0 Content-Type: text/plain X-Microsoft-Exchange-Diagnostics: 1;BLUPR03MB504;2:xAvLtEcwdtIR5gP4mCiOUDb2dD17ehWFIN80E1HJiUBVgyP6dnwGFVSQK6kc+SHuj3HURBI8H7NQ/acGU/S3/MvwiqHdEUv4E4Ud9681iXHr6VoW6jnMVQOwNejVHhJBR3w/lqY2PGab2lLTxPZAU0vCmTUAgaCfcJbmVFt/WxM=;3:2EPzjOuPX3tKUuml4MK4/tptytgn5P+3Emiwfj1QWlhrgKsUTQHu6ZrHCQRXL1jHGxk8zw+gHHJKtn3LBPG8jR8+XiGL68FDco62TqPdSeCdtCLDz/Ozwgv21WyNid1L+aVHLXehUhQy5TRNbiQtO31E6d6n7Lrdk7EpfYFR1AMuFBmjfSatkQCQoyYrNAIotCGjUwsg+zyQ3cdAkonzESzhPlEGeBg6tWSuyrV5HEE=;25:rsjO8FlBAomdmZnGTk4EXDXTxayJqb+j5yb3zyeZlA5Yw/7MUKQBMtFyHZDNErZJdhYADxEefgUc/whgxOJxCH4kWqn9cqpUsQsl18VWmQz60AoF8p7PxCUgS2mAa6VZwoIWVgvOgMb9nXpVIatBFHfSCcJKaus8EdC/PK+6eFVnga8g9CeXWyFb7KE8jSH+0ghdW9RZGc8WEHvVye4i5ZxyqLxhhfpSbENMQfiIsFrHj0J77D28ZT2aMh6nwVDb6lf2/UiQUSocUU+J6K5yxw== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BLUPR03MB504; X-Microsoft-Exchange-Diagnostics: 1;BLUPR03MB504;20:9R1ZFp2ocBvqtDXxGFxfieX0ZTz2YRM1H8pQ4FvQKFRv8+V+aOpcGYoHdH4UGMCPVpS6fxL7qXu6eCklFfuHTd198ec821SuOF83kf4zwtRCtto8ZacTX1Y7UWmXwIJkOaENZmdmjK1OxosaVa6UXs+jjebxgo3gS9h6GN4ZjqtjO5CkfzrKpJjx3vKsh9gcBS8IdCavx/ic0tK18LfoVjIFUuAXopLjUul3SAdrwTc1S/JPMilX/WNdP9kJXFWCU0bzHcOTf7rYMhG93Dv4vptmOMnjpewgUHUncz31zfOYJe6AUxIOtHY9pcxoHjIU2qh1gBYYQQph3wPguVODVcy2Nc+4rpb3n6lQ6wTO0uw=;4:n1eacFmfNVh1ZWcjJGkcJeQd5C+cvu0PxC6J7SS0HXByySknpBwTpAE4fU5n95yPBcPAmvFj4WHxD08w4DpT2g1bXOjmtL4TCElxHFmGiZ14mcTb4uMrUIS8LRQmhYV01iPlGMPAlvxZrAha+RNDCKCDiYYXEqK6VY3p6cJSLIxEin1GpeVxz2u28hMzxz7aWYxS8ulGDR/ppt8ZtCoWqF7ywXaBHhvznAZRFLZUuyd3v+fw8i9tMKA1dxRyU+Fq95Lb1A7uFl5OheumvWf/MjIAJIL5BpAxpVcsQIbX8YPpfLbPaAylGjmIazGepgVXai4kNxE/IPMKLNgYicrgqrsp5LDM7kGW0Qw9meO4u6scOSzGHw39AYD2rH4q+XC9 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(101931422205132); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(2401047)(8121501046)(5005006)(520078)(3002001)(102215026);SRVR:BLUPR03MB504;BCL:0;PCL:0;RULEID:;SRVR:BLUPR03MB504; X-Forefront-PRVS: 0741C77572 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;BLUPR03MB504;23:xiwx9xttng+rXWLJXbuuFx+Tf0Beovn4xppf3QSZKc?= =?us-ascii?Q?vUZn4MqnNWu/y8/ahWjxvoEqZQuOaRHv/1k049tWpfBjVhpFe2cl3C5GTFQe?= =?us-ascii?Q?RdBuXcbbGZcoX0jnN5HqD7rm3Px+7yqlzQHov1syXb45W/IppNsVM0bPiiJY?= =?us-ascii?Q?3lkmXNmjOWFI3aI6XhMp43qVmVo9zJIG6ARaSmjMU/ZFeuw5MO04CfJmwzRz?= =?us-ascii?Q?Bten4Uts3bpzbyPyL2z86Kn1s8VjeM0iV0+hC0Bzs0p4DiKyfVBTannOV0Zw?= =?us-ascii?Q?EaWaPXZ3uJqzwNPlBiK+2fxGqvPkUajfM01WbBQGimutbYBhAJDZnXb1vqyV?= =?us-ascii?Q?qh+3aGWzNd4afv0kclSTvum5FO9KdNlkz1/Y3Q+SwYrSZ3d4/KCbnQ69i/c4?= =?us-ascii?Q?OKSq0m8qaA+1yETmeV0TUO3ykwW2pkUwX1Otjkl34NTl/usyTQbgbsMIo8E+?= =?us-ascii?Q?AXTphOMdI1cmyz9F7R/4R1D2cQFxTPItpGJ/BMtpbcVpVPFYlQ9pgz15MK/z?= =?us-ascii?Q?cUMEd5gXesj299XJnAd/c7oh15RgNQtUuhcZG7zPRRwWr1WAHBKwtcpi2ht0?= =?us-ascii?Q?oJNQEWiJ5xyRvESvXpJsvFMEd77Jw2yUuYd80hGiD7HIxrFBcfiMgWcrFCgi?= =?us-ascii?Q?VtO5ltUSLpslEPBrap+LstB162vKZ82Fu6mL3871g0bvOXufUHcBHaa2wN6r?= =?us-ascii?Q?qqV089v/s+ZN3yvS+8ElyDK6EDrjL4z1qhirO1YxGmwATkwJNOtkb78tzBmB?= =?us-ascii?Q?MxyXd4Afk+b47WU8vFnpx6W6VJNHsYHrtl/5najIQskapJWiJtijEZNuKZwe?= =?us-ascii?Q?sdrAfSGEt5/IWqS3/f7z0j5jYNi3sMFXjmQtD4qKDEn3/Tt+bfO6i/6iUWNQ?= =?us-ascii?Q?Xmb4kMB3xbrKtcDoBxLhPTZ0HLr11HFDEnb6WCDDLP4vApTAy644zNSiwPV8?= =?us-ascii?Q?7aT838guJk+5it/QLU3KVvWjqSVNXTHNZP2RHuwjKouxIocdiIcKjnpbtUqU?= =?us-ascii?Q?Zapw7c/2eQVSsvztRB94Q/BQcuqMHbGqWZ2sj0uiHQeLJ5fUSY7eqkkefgSJ?= =?us-ascii?Q?INWn6TrDogBzvOl35Pz8pY8XegRgyaYpNCUGu6I3LR3IjUtu7qwkxBiv1QKC?= =?us-ascii?Q?ybpVB789U=3D?= X-Microsoft-Exchange-Diagnostics: 1;BLUPR03MB504;5:IaY4COh0M5hx41d3lLm5+zlAdQlKayYjOaR3fcd9/KGxsfoWBRuzppHaDLBAJ4uIoiAwXWXYnTW/sn6ibsvL8jjaWP5KapPwygwRLsfF6Qkc37JpA1E1Sw3wsI+yxIQzn6DOrjB/gkOG1hBs02Bvpw==;24:MI3F/8BvKv0oy66SbQC6Ve54lvyS8VD2My1fYgzoqxWRlYdkbBmIiFT+AbJQBHE63XXnWqIgjPz40TrKRTbVDTdBSBP0mUBZEHFffrKHIu8=;20:fEP9sqLGaOEBCNtZUWsowntHDn293lNQdAwoEt18KiSwYZGB+DzxesTgJHJIwQZbYyVTScuKJExFzRPHg4HwSQ== X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Oct 2015 16:04:47.8471 (UTC) X-MS-Exchange-CrossTenant-Id: 710a03f5-10f6-4d38-9ff4-a80b81da590d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=710a03f5-10f6-4d38-9ff4-a80b81da590d;Ip=[192.88.168.50];Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLUPR03MB504 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org All the IRQs for DPAA2 objects in the same DPRC must use the ICID of that DPRC, as their device Id in the GIC-ITS. Thus, all these IRQs must share the same ITT table in the GIC. As a result, a pool of IRQs with the same device Id must be preallocated per DPRC (fsl-mc bus instance). So, the fsl-mc bus object allocator is extended to also provide services to allocate IRQs to DPAA2 devices, from their parent fsl-mc bus IRQ pool. Signed-off-by: J. German Rivera --- drivers/staging/fsl-mc/bus/mc-allocator.c | 199 ++++++++++++++++++++++++++++ drivers/staging/fsl-mc/include/mc-private.h | 15 +++ drivers/staging/fsl-mc/include/mc.h | 9 ++ 3 files changed, 223 insertions(+) diff --git a/drivers/staging/fsl-mc/bus/mc-allocator.c b/drivers/staging/fsl-mc/bus/mc-allocator.c index 88d1857..6f1049a 100644 --- a/drivers/staging/fsl-mc/bus/mc-allocator.c +++ b/drivers/staging/fsl-mc/bus/mc-allocator.c @@ -15,6 +15,7 @@ #include "../include/dpcon-cmd.h" #include "dpmcp-cmd.h" #include "dpmcp.h" +#include /** * fsl_mc_resource_pool_add_device - add allocatable device to a resource @@ -160,6 +161,7 @@ static const char *const fsl_mc_pool_type_strings[] = { [FSL_MC_POOL_DPMCP] = "dpmcp", [FSL_MC_POOL_DPBP] = "dpbp", [FSL_MC_POOL_DPCON] = "dpcon", + [FSL_MC_POOL_IRQ] = "irq", }; static int __must_check object_type_to_pool_type(const char *object_type, @@ -465,6 +467,203 @@ void fsl_mc_object_free(struct fsl_mc_device *mc_adev) } EXPORT_SYMBOL_GPL(fsl_mc_object_free); +/* + * Initialize the interrupt pool associated with a MC bus. + * It allocates a block of IRQs from the GIC-ITS + */ +int fsl_mc_populate_irq_pool(struct fsl_mc_bus *mc_bus, + unsigned int irq_count) +{ + unsigned int i; + struct msi_desc *msi_desc; + struct fsl_mc_device_irq *irq_resources; + struct fsl_mc_device_irq *mc_dev_irq; + int error; + struct fsl_mc_device *mc_bus_dev = &mc_bus->mc_dev; + struct fsl_mc_resource_pool *res_pool = + &mc_bus->resource_pools[FSL_MC_POOL_IRQ]; + + if (WARN_ON(irq_count == 0 || + irq_count > FSL_MC_IRQ_POOL_MAX_TOTAL_IRQS)) + return -EINVAL; + + error = fsl_mc_msi_domain_alloc_irqs(&mc_bus_dev->dev, irq_count); + if (error < 0) + return error; + + irq_resources = devm_kzalloc(&mc_bus_dev->dev, + sizeof(*irq_resources) * irq_count, + GFP_KERNEL); + if (!irq_resources) { + error = -ENOMEM; + goto cleanup_msi_irqs; + } + + for (i = 0; i < irq_count; i++) { + mc_dev_irq = &irq_resources[i]; + + /* + * NOTE: This mc_dev_irq's MSI addr/value pair will be set + * by the fsl_mc_msi_write_msg() callback + */ + mc_dev_irq->resource.type = res_pool->type; + mc_dev_irq->resource.data = mc_dev_irq; + mc_dev_irq->resource.parent_pool = res_pool; + INIT_LIST_HEAD(&mc_dev_irq->resource.node); + list_add_tail(&mc_dev_irq->resource.node, &res_pool->free_list); + } + + for_each_msi_entry(msi_desc, &mc_bus_dev->dev) { + mc_dev_irq = &irq_resources[msi_desc->msi_attrib.entry_nr]; + mc_dev_irq->msi_desc = msi_desc; + mc_dev_irq->resource.id = msi_desc->irq; + } + + res_pool->max_count = irq_count; + res_pool->free_count = irq_count; + mc_bus->irq_resources = irq_resources; + return 0; + +cleanup_msi_irqs: + fsl_mc_msi_domain_free_irqs(&mc_bus_dev->dev); + return error; +} +EXPORT_SYMBOL_GPL(fsl_mc_populate_irq_pool); + +/** + * Teardown the interrupt pool associated with an MC bus. + * It frees the IRQs that were allocated to the pool, back to the GIC-ITS. + */ +void fsl_mc_cleanup_irq_pool(struct fsl_mc_bus *mc_bus) +{ + struct fsl_mc_device *mc_bus_dev = &mc_bus->mc_dev; + struct fsl_mc_resource_pool *res_pool = + &mc_bus->resource_pools[FSL_MC_POOL_IRQ]; + + if (WARN_ON(!mc_bus->irq_resources)) + return; + + if (WARN_ON(res_pool->max_count == 0)) + return; + + if (WARN_ON(res_pool->free_count != res_pool->max_count)) + return; + + INIT_LIST_HEAD(&res_pool->free_list); + res_pool->max_count = 0; + res_pool->free_count = 0; + mc_bus->irq_resources = NULL; + fsl_mc_msi_domain_free_irqs(&mc_bus_dev->dev); +} +EXPORT_SYMBOL_GPL(fsl_mc_cleanup_irq_pool); + +/** + * It allocates the IRQs required by a given MC object device. The + * IRQs are allocated from the interrupt pool associated with the + * MC bus that contains the device, if the device is not a DPRC device. + * Otherwise, the IRQs are allocated from the interrupt pool associated + * with the MC bus that represents the DPRC device itself. + */ +int __must_check fsl_mc_allocate_irqs(struct fsl_mc_device *mc_dev) +{ + int i; + int irq_count; + int res_allocated_count = 0; + int error = -EINVAL; + struct fsl_mc_device_irq **irqs = NULL; + struct fsl_mc_bus *mc_bus; + struct fsl_mc_resource_pool *res_pool; + + if (WARN_ON(mc_dev->irqs)) + return -EINVAL; + + irq_count = mc_dev->obj_desc.irq_count; + if (WARN_ON(irq_count == 0)) + return -EINVAL; + + if (strcmp(mc_dev->obj_desc.type, "dprc") == 0) + mc_bus = to_fsl_mc_bus(mc_dev); + else + mc_bus = to_fsl_mc_bus(to_fsl_mc_device(mc_dev->dev.parent)); + + if (WARN_ON(!mc_bus->irq_resources)) + return -EINVAL; + + res_pool = &mc_bus->resource_pools[FSL_MC_POOL_IRQ]; + if (res_pool->free_count < irq_count) { + dev_err(&mc_dev->dev, + "Not able to allocate %u irqs for device\n", irq_count); + return -ENOSPC; + } + + irqs = devm_kzalloc(&mc_dev->dev, irq_count * sizeof(irqs[0]), + GFP_KERNEL); + if (!irqs) + return -ENOMEM; + + for (i = 0; i < irq_count; i++) { + struct fsl_mc_resource *resource; + + error = fsl_mc_resource_allocate(mc_bus, FSL_MC_POOL_IRQ, + &resource); + if (error < 0) + goto error_resource_alloc; + + irqs[i] = to_fsl_mc_irq(resource); + res_allocated_count++; + + WARN_ON(irqs[i]->mc_dev); + irqs[i]->mc_dev = mc_dev; + irqs[i]->dev_irq_index = i; + } + + mc_dev->irqs = irqs; + return 0; + +error_resource_alloc: + for (i = 0; i < res_allocated_count; i++) { + irqs[i]->mc_dev = NULL; + fsl_mc_resource_free(&irqs[i]->resource); + } + + return error; +} +EXPORT_SYMBOL_GPL(fsl_mc_allocate_irqs); + +/* + * It frees the IRQs that were allocated for a MC object device, by + * returning them to the corresponding interrupt pool. + */ +void fsl_mc_free_irqs(struct fsl_mc_device *mc_dev) +{ + int i; + int irq_count; + struct fsl_mc_bus *mc_bus; + struct fsl_mc_device_irq **irqs = mc_dev->irqs; + + if (WARN_ON(!irqs)) + return; + + irq_count = mc_dev->obj_desc.irq_count; + + if (strcmp(mc_dev->obj_desc.type, "dprc") == 0) + mc_bus = to_fsl_mc_bus(mc_dev); + else + mc_bus = to_fsl_mc_bus(to_fsl_mc_device(mc_dev->dev.parent)); + + if (WARN_ON(!mc_bus->irq_resources)) + return; + + for (i = 0; i < irq_count; i++) { + WARN_ON(!irqs[i]->mc_dev); + irqs[i]->mc_dev = NULL; + fsl_mc_resource_free(&irqs[i]->resource); + } + + mc_dev->irqs = NULL; +} +EXPORT_SYMBOL_GPL(fsl_mc_free_irqs); + /** * fsl_mc_allocator_probe - callback invoked when an allocatable device is * being added to the system diff --git a/drivers/staging/fsl-mc/include/mc-private.h b/drivers/staging/fsl-mc/include/mc-private.h index f2504bc..97295f0 100644 --- a/drivers/staging/fsl-mc/include/mc-private.h +++ b/drivers/staging/fsl-mc/include/mc-private.h @@ -30,6 +30,16 @@ struct irq_domain; struct msi_domain_info; /** + * Maximum number of total IRQs that can be pre-allocated for an MC bus' + * IRQ pool + */ +#define FSL_MC_IRQ_POOL_MAX_TOTAL_IRQS 256 + +struct device_node; +struct irq_domain; +struct msi_domain_info; + +/** * struct fsl_mc - Private data of a "fsl,qoriq-mc" platform device * @root_mc_bus_dev: MC object device representing the root DPRC * @num_translation_ranges: number of entries in addr_translation_ranges @@ -137,4 +147,9 @@ int __init its_fsl_mc_msi_init(void); void its_fsl_mc_msi_cleanup(void); +int fsl_mc_populate_irq_pool(struct fsl_mc_bus *mc_bus, + unsigned int irq_count); + +void fsl_mc_cleanup_irq_pool(struct fsl_mc_bus *mc_bus); + #endif /* _FSL_MC_PRIVATE_H_ */ diff --git a/drivers/staging/fsl-mc/include/mc.h b/drivers/staging/fsl-mc/include/mc.h index 1c1d6ae..ac7c1ce 100644 --- a/drivers/staging/fsl-mc/include/mc.h +++ b/drivers/staging/fsl-mc/include/mc.h @@ -14,12 +14,14 @@ #include #include #include +#include #include "../include/dprc.h" #define FSL_MC_VENDOR_FREESCALE 0x1957 struct fsl_mc_device; struct fsl_mc_io; +struct fsl_mc_bus; /** * struct fsl_mc_driver - MC object device driver object @@ -75,6 +77,7 @@ enum fsl_mc_pool_type { FSL_MC_POOL_DPMCP = 0x0, /* corresponds to "dpmcp" in the MC */ FSL_MC_POOL_DPBP, /* corresponds to "dpbp" in the MC */ FSL_MC_POOL_DPCON, /* corresponds to "dpcon" in the MC */ + FSL_MC_POOL_IRQ, /* * NOTE: New resource pool types must be added before this entry @@ -141,6 +144,7 @@ struct fsl_mc_device_irq { * NULL if none. * @obj_desc: MC description of the DPAA device * @regions: pointer to array of MMIO region entries + * @irqs: pointer to array of pointers to interrupts allocated to this device * @resource: generic resource associated with this MC object device, if any. * * Generic device object for MC object devices that are "attached" to a @@ -172,6 +176,7 @@ struct fsl_mc_device { struct fsl_mc_io *mc_io; struct dprc_obj_desc obj_desc; struct resource *regions; + struct fsl_mc_device_irq **irqs; struct fsl_mc_resource *resource; }; @@ -215,6 +220,10 @@ int __must_check fsl_mc_object_allocate(struct fsl_mc_device *mc_dev, void fsl_mc_object_free(struct fsl_mc_device *mc_adev); +int __must_check fsl_mc_allocate_irqs(struct fsl_mc_device *mc_dev); + +void fsl_mc_free_irqs(struct fsl_mc_device *mc_dev); + extern struct bus_type fsl_mc_bus_type; #endif /* _FSL_MC_H_ */ -- 2.3.3