From patchwork Fri Sep 13 05:28:39 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Widawsky X-Patchwork-Id: 2881661 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id A9CCDBFF05 for ; Fri, 13 Sep 2013 05:37:30 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 92FAE20278 for ; Fri, 13 Sep 2013 05:37:29 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 9279920276 for ; Fri, 13 Sep 2013 05:37:28 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 97FBAE6234 for ; Thu, 12 Sep 2013 22:37:28 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail.bwidawsk.net (bwidawsk.net [166.78.191.112]) by gabe.freedesktop.org (Postfix) with ESMTP id AD938E6395 for ; Thu, 12 Sep 2013 22:29:10 -0700 (PDT) Received: by mail.bwidawsk.net (Postfix, from userid 5001) id 3906F59D14; Thu, 12 Sep 2013 22:29:10 -0700 (PDT) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-5.1 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from lundgren.intel.com (c-24-21-100-90.hsd1.or.comcast.net [24.21.100.90]) by mail.bwidawsk.net (Postfix) with ESMTPSA id 5C77559D16; Thu, 12 Sep 2013 22:28:55 -0700 (PDT) From: Ben Widawsky To: intel-gfx@lists.freedesktop.org Date: Thu, 12 Sep 2013 22:28:39 -0700 Message-Id: <1379050122-12774-14-git-send-email-benjamin.widawsky@intel.com> X-Mailer: git-send-email 1.8.4 In-Reply-To: <1379050122-12774-1-git-send-email-benjamin.widawsky@intel.com> References: <1379050122-12774-1-git-send-email-benjamin.widawsky@intel.com> Cc: bryan.j.bell@intel.com, Ben Widawsky , Ben Widawsky , vishnu.venkatesh@intel.com Subject: [Intel-gfx] [PATCH 13/16] intel_l3_parity: slice support X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org X-Virus-Scanned: ClamAV using ClamSMTP Haswell GT3 adds a new slice which is kept distinct from the old register interface. Plumb it into the code, though it's only 1 slice still. Signed-off-by: Ben Widawsky --- tools/intel_l3_parity.c | 113 +++++++++++++++++++++++++++++------------------- 1 file changed, 68 insertions(+), 45 deletions(-) diff --git a/tools/intel_l3_parity.c b/tools/intel_l3_parity.c index 5031fbd..fd09d39 100644 --- a/tools/intel_l3_parity.c +++ b/tools/intel_l3_parity.c @@ -52,6 +52,8 @@ static unsigned int devid; #define MAX_ROW (1<<12) #define L3_SIZE ((MAX_ROW * 4) * NUM_SUBBANKS * NUM_BANKS) #define NUM_REGS (NUM_BANKS * NUM_SUBBANKS) +#define MAX_SLICES 1 +#define REAL_MAX_SLICES 1 struct __attribute__ ((__packed__)) l3_log_register { uint32_t row0_enable : 1; @@ -60,15 +62,21 @@ struct __attribute__ ((__packed__)) l3_log_register { uint32_t row1_enable : 1; uint32_t rsvd1 : 4; uint32_t row1 : 11; -} l3log[MAX_BANKS][NUM_SUBBANKS]; +} l3logs[REAL_MAX_SLICES][MAX_BANKS][NUM_SUBBANKS]; -static void dumpit(void) +static int which_slice = -1; +#define for_each_slice(__i) \ + for ((__i) = (which_slice == -1) ? 0 : which_slice; \ + (__i) < ((which_slice == -1) ? MAX_SLICES : (which_slice + 1)); \ + (__i)++) + +static void dumpit(int slice) { int i, j; for (i = 0; i < NUM_BANKS; i++) { for (j = 0; j < NUM_SUBBANKS; j++) { - struct l3_log_register *reg = &l3log[i][j]; + struct l3_log_register *reg = &l3logs[slice][i][j]; if (reg->row0_enable) printf("Row %d, Bank %d, Subbank %d is disabled\n", @@ -80,9 +88,9 @@ static void dumpit(void) } } -static int disable_rbs(int row, int bank, int sbank) +static int disable_rbs(int row, int bank, int sbank, int slice) { - struct l3_log_register *reg = &l3log[bank][sbank]; + struct l3_log_register *reg = &l3logs[slice][bank][sbank]; // can't map more than 2 rows if (reg->row0_enable && reg->row1_enable) @@ -105,9 +113,9 @@ static int disable_rbs(int row, int bank, int sbank) return 0; } -static void enables_rbs(int row, int bank, int sbank) +static void enables_rbs(int row, int bank, int sbank, int slice) { - struct l3_log_register *reg = &l3log[bank][sbank]; + struct l3_log_register *reg = &l3logs[slice][bank][sbank]; if (!reg->row0_enable && !reg->row1_enable) return; @@ -126,6 +134,7 @@ static void usage(const char *name) " -r, --row=[row] The row to act upon (default 0)\n" " -b, --bank=[bank] The bank to act upon (default 0)\n" " -s, --subbank=[subbank] The subbank to act upon (default 0)\n" + " -w, --slice=[slice] Which slice to act on (default: -1 [all])" " ACTIONS (only 1 may be specified at a time):\n" " -h, --help Display this help\n" " -H, --hw-info Display the current L3 properties\n" @@ -139,31 +148,30 @@ static void usage(const char *name) int main(int argc, char *argv[]) { const int device = drm_get_card(); - char *path; + char *path[REAL_MAX_SLICES]; int row = 0, bank = 0, sbank = 0; - int drm_fd, fd, ret; + int fd[REAL_MAX_SLICES] = {0}, ret, i; int action = '0'; - - drm_fd = drm_open_any(); + int drm_fd = drm_open_any(); devid = intel_get_drm_devid(drm_fd); - ret = asprintf(&path, "/sys/class/drm/card%d/l3_parity", device); - assert(ret != -1); - - fd = open(path, O_RDWR); - if (fd == -1 && intel_gen(devid) > 6) { - perror("Opening sysfs"); - exit(EXIT_FAILURE); - } else if (fd == -1) + if (intel_gen(devid) < 7) exit(EXIT_SUCCESS); - ret = read(fd, l3log, NUM_REGS * sizeof(uint32_t)); - if (ret == -1) { - perror("Reading sysfs"); - exit(EXIT_FAILURE); + ret = asprintf(&path[0], "/sys/class/drm/card%d/l3_parity", device); + assert(ret != -1); + + for_each_slice(i) { + fd[i] = open(path[i], O_RDWR); + assert(fd[i]); + ret = read(fd[i], l3logs[i], NUM_REGS * sizeof(uint32_t)); + if (ret == -1) { + perror("Reading sysfs"); + exit(EXIT_FAILURE); + } + assert(lseek(fd[i], 0, SEEK_SET) == 0); } - assert(lseek(fd, 0, SEEK_SET) == 0); while (1) { int c, option_index = 0; @@ -177,10 +185,11 @@ int main(int argc, char *argv[]) { "row", required_argument, 0, 'r' }, { "bank", required_argument, 0, 'b' }, { "subbank", required_argument, 0, 's' }, + { "slice", required_argument, 0, 'w' }, {0, 0, 0, 0} }; - c = getopt_long(argc, argv, "hHr:b:s:aled::", long_options, + c = getopt_long(argc, argv, "hHr:b:s:w:aled::", long_options, &option_index); if (c == -1) break; @@ -191,6 +200,7 @@ int main(int argc, char *argv[]) usage(argv[0]); exit(EXIT_SUCCESS); case 'H': + printf("Number of slices: %d\n", MAX_SLICES); printf("Number of banks: %d\n", NUM_BANKS); printf("Subbanks per bank: %d\n", NUM_SUBBANKS); printf("L3 size: %dK\n", L3_SIZE >> 10); @@ -210,6 +220,11 @@ int main(int argc, char *argv[]) if (sbank >= NUM_SUBBANKS) exit(EXIT_FAILURE); break; + case 'w': + which_slice = atoi(optarg); + if (which_slice > 1) + exit(EXIT_FAILURE); + break; case 'd': if (optarg) { ret = sscanf(optarg, "%d,%d,%d", &row, &bank, &sbank); @@ -230,30 +245,38 @@ int main(int argc, char *argv[]) } } - switch (action) { - case 'l': - dumpit(); - exit(EXIT_SUCCESS); - case 'a': - memset(l3log, 0, sizeof(l3log)); - break; - case 'e': - enables_rbs(row, bank, sbank); - break; - case 'd': - assert(disable_rbs(row, bank, sbank) == 0); - break; - default: - abort(); + /* Per slice operations */ + for_each_slice(i) { + switch (action) { + case 'l': + dumpit(i); + break; + case 'a': + memset(l3logs[i], 0, NUM_REGS * sizeof(struct l3_log_register)); + break; + case 'e': + enables_rbs(row, bank, sbank, i); + break; + case 'd': + assert(disable_rbs(row, bank, sbank, i) == 0); + break; + default: + abort(); + } } - ret = write(fd, l3log, NUM_REGS * sizeof(uint32_t)); - if (ret == -1) { - perror("Writing sysfs"); - exit(EXIT_FAILURE); + if (action == 'l') + exit(EXIT_SUCCESS); + + for_each_slice(i) { + ret = write(fd[i], l3logs[i], NUM_REGS * sizeof(uint32_t)); + if (ret == -1) { + perror("Writing sysfs"); + exit(EXIT_FAILURE); + } + close(fd[i]); } - close(fd); exit(EXIT_SUCCESS); }