Message ID | 20211220025407.1321424-5-acelan.kao@canonical.com |
---|---|
State | New |
Headers | show
Return-Path: <kernel-team-bounces@lists.ubuntu.com> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=qLxr8CYO; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=<UNKNOWN>) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4JHPLy1RP3z9t5G for <incoming@patchwork.ozlabs.org>; Mon, 20 Dec 2021 13:54:33 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from <kernel-team-bounces@lists.ubuntu.com>) id 1mz8oh-0004QL-I9; Mon, 20 Dec 2021 02:54:23 +0000 Received: from mail-pf1-f175.google.com ([209.85.210.175]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from <acelan@gmail.com>) id 1mz8oe-0004OL-7m for kernel-team@lists.ubuntu.com; Mon, 20 Dec 2021 02:54:20 +0000 Received: by mail-pf1-f175.google.com with SMTP id b22so2694622pfb.5 for <kernel-team@lists.ubuntu.com>; Sun, 19 Dec 2021 18:54:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=hbW6FLihHRb8ekUV+k1zoGW0FnE05/IGf7b4cFAbH+g=; b=qLxr8CYOgCSvm9sZWyodVmvPr3QXIAKOQcO53mjma3sEA77gc2GMTRwyd2i/qN11ZN gb/R2w+chVkO+DZS7n0BhhVJph7koQXkf6pfd8+epRAzfo09JxV5HOabaSUslJ3Zjz1e US7eoJcx+mUqGROpAuk0O8J1SHbtL7ebGiGCHPg0V9hW7HJrKQG06Z5cxHxPMzjk/Kzy uqEw5Jwz6Nny2aFMHIsqLdnGSUNpywOveJ0UyUqVd2ekbNwH6U6bDRFk47ebwLQcxusi 8yKrqhs/D4kj+q/1CPx9W8xEeehpSMzP+QS6twEDr/QPwHODTqQUr5FUUbXmrL/37E7W qVrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=hbW6FLihHRb8ekUV+k1zoGW0FnE05/IGf7b4cFAbH+g=; b=eAW3ERvIYvpfzBGSkLvYoLCXuwMJLPJRtnr923fUEwwW/GQxNEhHS/u7x3tFQsTOnE mgYxBZT+xazlzRcJWorg4v0XtgF1JXRWDW0ZQbfZB9v1hLuDh77LvlL1ak7QV9vYj3X4 0Sr3HDFx0fgd2kmVS7py7z22vb+Aj32CuiMeATulc+rOJdgFkn/AmB+diOfAnuO29367 rSQVIsS0oFY5uUE6u28aOBM2eEtjjgaiMaX3ZtQFSlRHFHIE6XCpns4PtNQWiKhT3u8W UOkgSLfgKVbEoGJlE4p9csQndL4NKfRYXgQNmM/f9hKoxRCGAGMtr3T5ux2OaRWwqE3T kIHA== X-Gm-Message-State: AOAM53044f00cbAuQdvYbOKykhFpU8bxicimq3ixDEtzju0OfCN1wb3i g0g+zNLCpozqdmqwZ3yGYS9qEqtOCEc= X-Google-Smtp-Source: ABdhPJzb8qXjMTl8qbD7m4YgRAcCNLg7o4nzbFEIpbaAkrHe0ODVI9oIEI2hE3lSid9lH6w5Uw1yhg== X-Received: by 2002:a65:6118:: with SMTP id z24mr13241047pgu.209.1639968858138; Sun, 19 Dec 2021 18:54:18 -0800 (PST) Received: from localhost (220-135-95-34.hinet-ip.hinet.net. [220.135.95.34]) by smtp.gmail.com with ESMTPSA id b9sm15757508pfm.122.2021.12.19.18.54.17 for <kernel-team@lists.ubuntu.com> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Dec 2021 18:54:17 -0800 (PST) From: AceLan Kao <acelan.kao@canonical.com> To: kernel-team@lists.ubuntu.com Subject: [PATCH v2 4/6][SRU][J][OEM-5.14] UBUNTU: SAUCE: thunderbolt: Do not allow subtracting more NFC credits than configured Date: Mon, 20 Dec 2021 10:54:05 +0800 Message-Id: <20211220025407.1321424-5-acelan.kao@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211220025407.1321424-1-acelan.kao@canonical.com> References: <20211220025407.1321424-1-acelan.kao@canonical.com> MIME-Version: 1.0 Received-SPF: pass client-ip=209.85.210.175; envelope-from=acelan@gmail.com; helo=mail-pf1-f175.google.com X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions <kernel-team.lists.ubuntu.com> List-Unsubscribe: <https://lists.ubuntu.com/mailman/options/kernel-team>, <mailto:kernel-team-request@lists.ubuntu.com?subject=unsubscribe> List-Archive: <https://lists.ubuntu.com/archives/kernel-team> List-Post: <mailto:kernel-team@lists.ubuntu.com> List-Help: <mailto:kernel-team-request@lists.ubuntu.com?subject=help> List-Subscribe: <https://lists.ubuntu.com/mailman/listinfo/kernel-team>, <mailto:kernel-team-request@lists.ubuntu.com?subject=subscribe> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" <kernel-team-bounces@lists.ubuntu.com> |
Series |
devices on thunderbolt dock
|
expand
|
diff --git a/drivers/thunderbolt/switch.c b/drivers/thunderbolt/switch.c index 0acb2f3fe2661..f384cda76e862 100644 --- a/drivers/thunderbolt/switch.c +++ b/drivers/thunderbolt/switch.c @@ -623,6 +623,9 @@ int tb_port_add_nfc_credits(struct tb_port *port, int credits) return 0; nfc_credits = port->config.nfc_credits & ADP_CS_4_NFC_BUFFERS_MASK; + if (credits < 0) + credits = max_t(int, -nfc_credits, credits); + nfc_credits += credits; tb_port_dbg(port, "adding %d NFC credits to %lu", credits,